aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-tcp-stream-ssl.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 4ec15cce5d..ecc2f3010e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-10 Chris Toshok <toshok@ximian.com>
+
+ * camel-tcp-stream-ssl.c (stream_connect): call SSL_Enable after
+ the SSL_ImportFD and before PR_Connect. Otherwise, NSS aborts
+ during the connect.
+
2001-05-10 Jeffrey Stedfast <fejj@ximian.com>
* camel-session.c (camel_session_get_password): Don't abort if the
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index 2a9a0fb602..6d5e25e37a 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -393,7 +393,8 @@ stream_connect (CamelTcpStream *stream, struct hostent *host, int port)
fd = PR_OpenTCPSocket (host->h_addrtype);
ssl_fd = SSL_ImportFD (NULL, fd);
-
+
+ SSL_Enable (ssl_fd, SSL_SECURITY, PR_TRUE);
SSL_SetURL (ssl_fd, ssl->priv->expected_host);
if (ssl_fd == NULL || PR_Connect (ssl_fd, &netaddr, timeout) == PR_FAILURE) {