Commit f4677b79 authored by Lutz Jänicke's avatar Lutz Jänicke
Browse files

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.
parent 92308905

ssl/d1_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

ssl/ssl_ciph.c

+3 −0
Original line number Diff line number Diff line
@@ -115,7 +115,10 @@ 
 */

#include <stdio.h>

#include <openssl/objects.h>

#ifndef OPENSSL_NO_COMP

#include <openssl/comp.h>

#endif



#include "ssl_locl.h"



#define SSL_ENC_DES_IDX		0

ssl/ssl_locl.h

+4 −0
Original line number Diff line number Diff line
@@ -124,7 +124,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
@@ -500,6 +502,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

	{
@@ -507,6 +510,7 @@ typedef struct ssl3_comp_st 
	char *name;	/* Text name used for the compression type */

	COMP_METHOD *method; /* The method :-) */

	} SSL3_COMP;

#endif



extern SSL3_ENC_METHOD ssl3_undef_enc_method;

OPENSSL_EXTERN SSL_CIPHER ssl2_ciphers[];

ssl/t1_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -111,7 +111,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>