[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[14571] trunk/imap_proxy
From:       pdontthink () users ! sourceforge ! net
Date:       2016-09-14 2:16:56
Message-ID: E1bjzkx-00064D-HB () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14571
          http://sourceforge.net/p/squirrelmail/code/14571
Author:   pdontthink
Date:     2016-09-14 02:16:55 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
Retain compatibility with older OpenSSL versions (thanks to Wolfgang Breyha)

Modified Paths:
--------------
    trunk/imap_proxy/ChangeLog
    trunk/imap_proxy/src/icc.c
    trunk/imap_proxy/src/main.c

Modified: trunk/imap_proxy/ChangeLog
===================================================================
--- trunk/imap_proxy/ChangeLog	2016-09-14 02:01:49 UTC (rev 14570)
+++ trunk/imap_proxy/ChangeLog	2016-09-14 02:16:55 UTC (rev 14571)
@@ -1,6 +1,8 @@
 2016-09-12  Paul Lesniewski <paul@squirrelmail.org>
 	* Added support for systemd startup
 	* Added support for accepting pre-auth ID commands (RFC 2971)
+	* Retain compatibility with older OpenSSL versions (thanks to
+	  Wolfgang Breyha)
 	* Make EGD support conditional, provide compatibility with
 	  LibreSSL, other small fixes provided by the BSD team
 	* Fixed anomalous crashes recycling used connections (thanks

Modified: trunk/imap_proxy/src/icc.c
===================================================================
--- trunk/imap_proxy/src/icc.c	2016-09-14 02:01:49 UTC (rev 14570)
+++ trunk/imap_proxy/src/icc.c	2016-09-14 02:16:55 UTC (rev 14571)
@@ -153,7 +153,7 @@
 		}
 		else
 		{
-		    syslog(LOG_WARNING, "Expiring freed ICC");
+		    syslog(LOG_INFO, "Expiring invalidated server sd");
 		}
 		
 		/*
@@ -281,6 +281,8 @@
 
     close( ICC->server_conn->sd );
 
+    syslog(LOG_INFO, "Invalidating server sd [%d]", ICC->server_conn->sd);
+
     ICC->server_conn->sd = -1; /* make sure this can't be reused */
     ICC->logouttime = 1;
 }

Modified: trunk/imap_proxy/src/main.c
===================================================================
--- trunk/imap_proxy/src/main.c	2016-09-14 02:01:49 UTC (rev 14570)
+++ trunk/imap_proxy/src/main.c	2016-09-14 02:16:55 UTC (rev 14571)
@@ -481,11 +481,15 @@
     if ( PC_Struct.tls_no_tlsv1 ) 
         tls_options |= SSL_OP_NO_TLSv1;
 
+#ifdef SSL_OP_NO_TLSv1_1
     if ( PC_Struct.tls_no_tlsv1_1 ) 
         tls_options |= SSL_OP_NO_TLSv1_1;
+#endif
 
+#ifdef SSL_OP_NO_TLSv1_2
     if ( PC_Struct.tls_no_tlsv1_2 ) 
         tls_options |= SSL_OP_NO_TLSv1_2;
+#endif
 
     SSL_CTX_set_options( tls_ctx, tls_options );
  
@@ -524,6 +528,7 @@
     }
 
     /* Enable ECDHE is OpenSSL has it */
+#if !defined(OPENSSL_NO_ECDH) && OPENSSL_VERSION_NUMBER >= 0x10000000L
 #ifdef NID_X9_62_prime256v1
     {
         EC_KEY *ecdh;
@@ -533,6 +538,7 @@
         EC_KEY_free( ecdh );
     }
 #endif
+#endif
 #endif /* HAVE_LIBSSL */
 
 

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]