Commit Diff

Commit:
c6a43fbaf0579741ebf34e88ca7f0586b471062e
From:
Florian Westphal <fw@strlen.de>
Date:
Message:
TLS/SSL: fix memory leak when using compressed server links with ssl commit 6bc2d3d06e9cb4da68ea4b63d9b6b219d88ab927 (New connection option CONN_RFC1459) forgot to adjust the ssl bitmasks. The result is that when a compressed AND encrypted server link goes down the memory allocated by zlib and the r/w buffers are no longer free'd as the previous ConnSSL_Free() would then also remove the CONN_ZIP flag from the flag mask.
Actions:
Patch | Tree
commit - 3be9c477be674228c86378e017a70bf49acf06a4
commit + c6a43fbaf0579741ebf34e88ca7f0586b471062e
blob - 08f6dde01766040d4cdd0b333de1a39be80ac273
blob + bd332b63b394ef01cc989fcc1b580b419d4d8e9b
--- src/ngircd/conn.h
+++ src/ngircd/conn.h
@@ -18,7 +18,13 @@
 
 #include <time.h>			/* for time_t, see below */
 
-
+/*
+ * connection state flags. this is a bitmask -- all values must
+ * be unique and a power of two.
+ *
+ * If you introduce new ones in between, make sure to adjust all
+ * remaining ones.
+ */
 #define CONN_ISCLOSING		1	/* Conn_Close() already called */
 #define CONN_ISCONNECTING	2	/* connect() in progress */
 #define CONN_RFC1459		4	/* RFC 1459 compatibility mode */
@@ -29,10 +35,10 @@
 #include "conf-ssl.h"
 
 #ifdef SSL_SUPPORT
-#define CONN_SSL_CONNECT	8	/* wait for ssl connect to finish */
-#define CONN_SSL		16	/* this connection is SSL encrypted */
-#define CONN_SSL_WANT_WRITE	32	/* SSL/TLS library needs to write protocol data */
-#define CONN_SSL_WANT_READ	64	/* SSL/TLS library needs to read protocol data */
+#define CONN_SSL_CONNECT	16	/* wait for ssl connect to finish */
+#define CONN_SSL		32	/* this connection is SSL encrypted */
+#define CONN_SSL_WANT_WRITE	64	/* SSL/TLS library needs to write protocol data */
+#define CONN_SSL_WANT_READ	128	/* SSL/TLS library needs to read protocol data */
 #endif
 typedef int CONN_ID;