From: Lutz Jänicke <jaenicke@openssl.org>
Date: Mon, 5 Jan 2009 14:43:05 +0000 (+0000)
Subject: Fix compilation with -no-comp by adding some more #ifndef OPENSSL_NO_COMP
X-Git-Tag: OpenSSL_0_9_8k^2~70
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fceac0bc74ad0a1c2d93f49d619edbc2d948dddc;p=oweals%2Fopenssl.git

Fix compilation with -no-comp by adding some more #ifndef OPENSSL_NO_COMP

Some #include statements were not properly protected. This will go unnoted
on most systems as openssl/comp.h tends to be installed as a system header
file by default but may become visible when cross compiling.
---

diff --git a/ssl/d1_enc.c b/ssl/d1_enc.c
index 9de787e8f6..7f3e57fc1e 100644
--- a/ssl/d1_enc.c
+++ b/ssl/d1_enc.c
@@ -115,7 +115,9 @@
 
 #include <stdio.h>
 #include "ssl_locl.h"
+#ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
+#endif
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/md5.h>
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 8858dcb8c6..4826df8002 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -142,7 +142,9 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
+#ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
+#endif
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 2e6e98fc32..039ee6b28e 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -150,7 +150,9 @@
 #include "e_os.h"
 
 #include <openssl/buffer.h>
+#ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
+#endif
 #include <openssl/bio.h>
 #include <openssl/stack.h>
 #ifndef OPENSSL_NO_RSA
@@ -554,6 +556,7 @@ typedef struct ssl3_enc_method
 	int (*alert_value)(int);
 	} SSL3_ENC_METHOD;
 
+#ifndef OPENSSL_NO_COMP
 /* Used for holding the relevant compression methods loaded into SSL_CTX */
 typedef struct ssl3_comp_st
 	{
@@ -561,6 +564,7 @@ typedef struct ssl3_comp_st
 	char *name;	/* Text name used for the compression type */
 	COMP_METHOD *method; /* The method :-) */
 	} SSL3_COMP;
+#endif
 
 #ifndef OPENSSL_NO_BUF_FREELISTS
 typedef struct ssl3_buf_freelist_st
diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index ea3cd710e5..b482f6cf9c 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -137,7 +137,9 @@
 
 #include <stdio.h>
 #include "ssl_locl.h"
+#ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
+#endif
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/md5.h>