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 9de787e8f64b4bcba542ff4c85f13d1533d4d3b5..7f3e57fc1e2f9227bc631698e053c04ef422e015 100644 (file)
--- 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 8858dcb8c65337c2c7361d2663e307e7d8deb9a1..4826df8002d2132a8e648055efb68610abec262f 100644 (file)
--- 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 2e6e98fc32098c511cf986c191c3dfb5de98281f..039ee6b28ebbfae6beffaf8d2c4d09992ffcde97 100644 (file)
--- 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 ea3cd710e518012b9d5e77f07bba9774c2095aab..b482f6cf9c0dd0b2c74db3a03763c34859a82600 100644 (file)
--- 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>