Back out SSL changes. Newer patch available.

src/backend/libpq/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for libpq subsystem (backend half of libpq interface)
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.31 2002/06/14 03:56:46 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.32 2002/06/14 04:09:36 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,8 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 # be-fsstubs is here for historical reasons, probably belongs elsewhere
 
-OBJS = be-fsstubs.o be-ssl.o auth.o crypt.o hba.o md5.o pqcomm.o \
-       pqformat.o pqsignal.o
+OBJS = be-fsstubs.o auth.o crypt.o hba.o md5.o pqcomm.o pqformat.o pqsignal.o
 
 
 all: SUBSYS.o

src/backend/libpq/pqcomm.c

@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.134 2002/06/14 03:56:46 momjian Exp $
+ *	$Id: pqcomm.c,v 1.135 2002/06/14 04:09:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,14 +81,6 @@
 #include "miscadmin.h"
 #include "storage/ipc.h"
 
-/* these functions are misnamed - they handle both SSL and non-SSL case */
-extern ssize_t read_SSL(Port *, void *ptr, size_t len);
-extern ssize_t write_SSL(Port *, const void *ptr, size_t len);
-
-#ifdef USE_SSL
-extern void close_SSL(Port *);
-#endif /* USE_SSL */
-
 
 static void pq_close(void);
 
@@ -146,9 +138,6 @@ pq_close(void)
 {
 	if (MyProcPort != NULL)
 	{
-#ifdef USE_SSL
-		close_SSL(MyProcPort);
-#endif /* USE_SSL */
 		close(MyProcPort->sock);
 		/* make sure any subsequent attempts to do I/O fail cleanly */
 		MyProcPort->sock = -1;
@@ -427,7 +416,6 @@ StreamConnection(int server_fd, Port *port)
 void
 StreamClose(int sock)
 {
-	/* FIXME - what about closing SSL connections? */
 	close(sock);
 }
 
@@ -469,8 +457,14 @@ pq_recvbuf(void)
 	{
 		int			r;
 
-		r = read_SSL(MyProcPort, PqRecvBuffer + PqRecvLength,
-					 PQ_BUFFER_SIZE - PqRecvLength);
+#ifdef USE_SSL
+		if (MyProcPort->ssl)
+			r = SSL_read(MyProcPort->ssl, PqRecvBuffer + PqRecvLength,
+						 PQ_BUFFER_SIZE - PqRecvLength);
+		else
+#endif
+			r = recv(MyProcPort->sock, PqRecvBuffer + PqRecvLength,
+					 PQ_BUFFER_SIZE - PqRecvLength, 0);
 
 		if (r < 0)
 		{
@@ -486,11 +480,7 @@ pq_recvbuf(void)
 			elog(COMMERROR, "pq_recvbuf: recv() failed: %m");
 			return EOF;
 		}
-#ifdef USE_SSL
-		if (r == 0 && !MyProcPort->ssl)
-#else /* USE_SSL */
 		if (r == 0)
-#endif /* USE_SSL */
 		{
 			/* as above, only write to postmaster log */
 			elog(COMMERROR, "pq_recvbuf: unexpected EOF on client connection");
@@ -661,13 +651,14 @@ pq_flush(void)
 	{
 		int			r;
 
-		r = write_SSL(MyProcPort, bufptr, bufend - bufptr);
-
 #ifdef USE_SSL
-		if (r < 0 || (r == 0 && !MyProcPort->ssl))
-#else /* USE_SSL */
+		if (MyProcPort->ssl)
+			r = SSL_write(MyProcPort->ssl, bufptr, bufend - bufptr);
+		else
+#endif
+			r = send(MyProcPort->sock, bufptr, bufend - bufptr, 0);
+
 		if (r <= 0)
-#endif /* USE_SSL */
 		{
 			if (errno == EINTR)
 				continue;		/* Ok if we were interrupted */
@@ -712,9 +703,8 @@ int
 pq_eof(void)
 {
 	char		x;
-	int			res = 1;
+	int			res;
 
-#ifndef USE_SSL /* not a good solution, but better than nothing */
 	res = recv(MyProcPort->sock, &x, 1, MSG_PEEK);
 
 	if (res < 0)
@@ -723,8 +713,6 @@ pq_eof(void)
 		elog(COMMERROR, "pq_eof: recv() failed: %m");
 		return EOF;
 	}
-#endif /* USE_SSL */
-
 	if (res == 0)
 		return EOF;
 	else

src/backend/postmaster/postmaster.c

@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.277 2002/06/14 03:56:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.278 2002/06/14 04:09:36 momjian Exp $
  *
  * NOTES
  *
@@ -165,6 +165,10 @@ static int	ServerSock_INET = INVALID_SOCK;		/* stream socket server */
 static int	ServerSock_UNIX = INVALID_SOCK;		/* stream socket server */
 #endif
 
+#ifdef USE_SSL
+static SSL_CTX *SSL_context = NULL;		/* Global SSL context */
+#endif
+
 /*
  * Set by the -o option
  */
@@ -270,10 +274,8 @@ __attribute__((format(printf, 1, 2)));
 #define ShutdownDataBase()		SSDataBase(BS_XLOG_SHUTDOWN)
 
 #ifdef USE_SSL
-extern int initialize_ctx(const char *, void (*err)(const char *fmt,...));
-extern void destroy_ctx(void);
-extern int open_SSL_server(Port *);
-extern void close_SSL(Port *);
+static void InitSSL(void);
+static const char *SSLerrmessage(void);
 #endif
 
 
@@ -607,10 +609,7 @@ PostmasterMain(int argc, char *argv[])
 		ExitPostmaster(1);
 	}
 	if (EnableSSL)
-		{
-		if (initialize_ctx(NULL, postmaster_error) == -1)
-			ExitPostmaster(1);
-		}
+		InitSSL();
 #endif
 
 	/*
@@ -1115,9 +1114,13 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 
 #ifdef USE_SSL
 		if (SSLok == 'S')
-  		{
-			if (open_SSL_server(port) != STATUS_OK)
+		{
+			if (!(port->ssl = SSL_new(SSL_context)) ||
+				!SSL_set_fd(port->ssl, port->sock) ||
+				SSL_accept(port->ssl) <= 0)
 			{
+				elog(LOG, "failed to initialize SSL connection: %s (%m)",
+					 SSLerrmessage());
 				return STATUS_ERROR;
 			}
 		}
@@ -1319,10 +1322,9 @@ static void
 ConnFree(Port *conn)
 {
 #ifdef USE_SSL
-	close_SSL(conn);
+	if (conn->ssl)
+		SSL_free(conn->ssl);
 #endif
-	if (conn->sock != -1)
-		close(conn->sock);
 	free(conn);
 }
 
@@ -2422,6 +2424,72 @@ CountChildren(void)
 	return cnt;
 }
 
+#ifdef USE_SSL
+
+/*
+ * Initialize SSL library and structures
+ */
+static void
+InitSSL(void)
+{
+	char		fnbuf[2048];
+
+	SSL_load_error_strings();
+	SSL_library_init();
+	SSL_context = SSL_CTX_new(SSLv23_method());
+	if (!SSL_context)
+	{
+		postmaster_error("failed to create SSL context: %s",
+						 SSLerrmessage());
+		ExitPostmaster(1);
+	}
+	snprintf(fnbuf, sizeof(fnbuf), "%s/server.crt", DataDir);
+	if (!SSL_CTX_use_certificate_file(SSL_context, fnbuf, SSL_FILETYPE_PEM))
+	{
+		postmaster_error("failed to load server certificate (%s): %s",
+						 fnbuf, SSLerrmessage());
+		ExitPostmaster(1);
+	}
+	snprintf(fnbuf, sizeof(fnbuf), "%s/server.key", DataDir);
+	if (!SSL_CTX_use_PrivateKey_file(SSL_context, fnbuf, SSL_FILETYPE_PEM))
+	{
+		postmaster_error("failed to load private key file (%s): %s",
+						 fnbuf, SSLerrmessage());
+		ExitPostmaster(1);
+	}
+	if (!SSL_CTX_check_private_key(SSL_context))
+	{
+		postmaster_error("check of private key failed: %s",
+						 SSLerrmessage());
+		ExitPostmaster(1);
+	}
+}
+
+/*
+ * Obtain reason string for last SSL error
+ *
+ * Some caution is needed here since ERR_reason_error_string will
+ * return NULL if it doesn't recognize the error code.  We don't
+ * want to return NULL ever.
+ */
+static const char *
+SSLerrmessage(void)
+{
+	unsigned long	errcode;
+	const char	   *errreason;
+	static char		errbuf[32];
+
+	errcode = ERR_get_error();
+	if (errcode == 0)
+		return "No SSL error reported";
+	errreason = ERR_reason_error_string(errcode);
+	if (errreason != NULL)
+		return errreason;
+	snprintf(errbuf, sizeof(errbuf), "SSL error code %lu", errcode);
+	return errbuf;
+}
+
+#endif /* USE_SSL */
 
 /*
  * Fire off a subprocess for startup/shutdown/checkpoint.