[ssl/build] some minor fixes; fix compile without ssl, cleanup ssl config buffers

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2789 152afb58-edef-0310-8abb-c4023f1b3aa9

NEWS

@@ -12,6 +12,7 @@ NEWS
          add ssl.use-sslv3 (fixes #2246)
          load all algorithms (fixes #2239)
   * [ssl/md5] prefix our own md5 implementation with li_ so it doesn't conflict with the openssl one (fixes #2269)
+  * [ssl/build] some minor fixes; fix compile without ssl, cleanup ssl config buffers
 
 - 1.4.28 - 2010-08-22
   * Rename fdevent_event_add to _set to reflect what the function does. Fix some handlers. (fixes #2249)

src/CMakeLists.txt

@@ -34,7 +34,7 @@ IF(CMAKE_COMPILER_IS_GNUCC)
 	OPTION(BUILD_EXTRA_WARNINGS "extra warnings")
 
 	IF(BUILD_EXTRA_WARNINGS)
-		SET(WARN_FLAGS "-g -O2 -g2 -Wall -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winline -Wsign-compare -Wnested-externs -Wpointer-arith -Wformat-security")
+		SET(WARN_FLAGS "-g -g2 -Wall -Wmissing-declarations -Wdeclaration-after-statement -Wcast-align -Winline -Wsign-compare -Wnested-externs -Wpointer-arith -Wformat-security")
 		# -Wl,--as-needed
 		# -Werror -Wbad-function-cast -Wmissing-prototypes
 	ELSE(BUILD_EXTRA_WARNINGS)

src/network.c

@@ -479,13 +479,15 @@ int network_init(server *srv) {
 	size_t i;
 	network_backend_t backend;
 
-	DH *dh;
-	BIO *bio;
 #if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 	EC_KEY *ecdh;
 	int nid;
 #endif
 
+#ifdef USE_OPENSSL
+	DH *dh;
+	BIO *bio;
+
        /* 1024-bit MODP Group with 160-bit prime order subgroup (RFC5114)
 	* -----BEGIN DH PARAMETERS-----
 	* MIIBDAKBgQCxC4+WoIDgHd6S3l6uXVTsUsmfvPsGo8aaap3KUtI7YWBz4oZ1oj0Y
@@ -497,7 +499,7 @@ int network_init(server *srv) {
 	* -----END DH PARAMETERS-----
 	*/
 
-	static unsigned char dh1024_p[]={
+	static const unsigned char dh1024_p[]={
 		0xB1,0x0B,0x8F,0x96,0xA0,0x80,0xE0,0x1D,0xDE,0x92,0xDE,0x5E,
 		0xAE,0x5D,0x54,0xEC,0x52,0xC9,0x9F,0xBC,0xFB,0x06,0xA3,0xC6,
 		0x9A,0x6A,0x9D,0xCA,0x52,0xD2,0x3B,0x61,0x60,0x73,0xE2,0x86,
@@ -511,7 +513,7 @@ int network_init(server *srv) {
 		0xDF,0x1F,0xB2,0xBC,0x2E,0x4A,0x43,0x71,
 	};
 
-	static unsigned char dh1024_g[]={
+	static const unsigned char dh1024_g[]={
 		0xA4,0xD1,0xCB,0xD5,0xC3,0xFD,0x34,0x12,0x67,0x65,0xA4,0x42,
 		0xEF,0xB9,0x99,0x05,0xF8,0x10,0x4D,0xD2,0x58,0xAC,0x50,0x7F,
 		0xD6,0x40,0x6C,0xFF,0x14,0x26,0x6D,0x31,0x26,0x6F,0xEA,0x1E,
@@ -524,6 +526,7 @@ int network_init(server *srv) {
 		0x18,0xD0,0x8B,0xC8,0x85,0x8F,0x4D,0xCE,0xF9,0x7C,0x2A,0x24,
 		0x85,0x5E,0x6E,0xEB,0x22,0xB3,0xB2,0xE5,
 	};
+#endif
 
 	struct nb_map {
 		network_backend_t nb;

src/server.c

@@ -306,6 +306,8 @@ static void server_free(server *srv) {
 			buffer_free(s->ssl_pemfile);
 			buffer_free(s->ssl_ca_file);
 			buffer_free(s->ssl_cipher_list);
+			buffer_free(s->ssl_dh_file);
+			buffer_free(s->ssl_ec_curve);
 			buffer_free(s->error_handler);
 			buffer_free(s->errorfile_prefix);
 			array_free(s->mimetypes);