From 7fe712882b909931088a318c08041b0e7974a000 Mon Sep 17 00:00:00 2001
From: Eduardo Chappa <chappa@washington.edu>
Date: Sat, 2 Nov 2013 02:51:18 -0600
Subject:  *  Update to version 2.19.1  *  Upgrade UW-IMAP to Panda IMAP from
 https://github.com/jonabbey/panda-imap.  *  Replace tabs by spaces in From
 and Subject fields to control for size in     screen of these fields. Change
 only in index screen display.

---
 imap/src/osdep/nt/ssl_old.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

(limited to 'imap/src/osdep/nt/ssl_old.c')

diff --git a/imap/src/osdep/nt/ssl_old.c b/imap/src/osdep/nt/ssl_old.c
index 121bd02e..5d00b48b 100644
--- a/imap/src/osdep/nt/ssl_old.c
+++ b/imap/src/osdep/nt/ssl_old.c
@@ -1,13 +1,5 @@
 /* ========================================================================
- * Copyright 1988-2008 University of Washington
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 
+ * Copyright 2008-2009 Mark Crispin
  * ========================================================================
  */
 
@@ -15,15 +7,20 @@
  * Program:	SSL authentication/encryption module for Windows 9x and NT
  *
  * Author:	Mark Crispin
- *		Networks and Distributed Computing
- *		Computing & Communications
- *		University of Washington
- *		Administration Building, AG-44
- *		Seattle, WA  98195
- *		Internet: MRC@CAC.Washington.EDU
  *
  * Date:	22 September 1998
- * Last Edited:	13 January 2008
+ * Last Edited:	9 November 2009
+ *
+ * Previous versions of this file were
+ *
+ * Copyright 1988-2008 University of Washington
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  */
 
 #define SECURITY_WIN32
@@ -442,6 +439,7 @@ long ssl_getdata (SSLSTREAM *stream)
     SecBufferDesc msg;
     size_t i;
     size_t n = 0;		/* initially no bytes to decrypt */
+    if (!stream->tcpstream) return NIL;
     do {			/* yes, make sure have data from TCP */
       if (stream->iextractr) {	/* have previous unread data? */
 	memcpy (stream->ibuf + n,stream->iextraptr,stream->iextractr);
@@ -586,7 +584,7 @@ static long ssl_abort (SSLSTREAM *stream)
 
 char *ssl_host (SSLSTREAM *stream)
 {
-  return tcp_host (stream->tcpstream);
+  return stream ? tcp_host (stream->tcpstream) : "UNKNOWN";
 }
 
 
-- 
cgit v1.2.3-54-g00ecf