generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Lutz Jänicke
2009-01-05 14:43:07 +00:00
parent 92308905dd
commit f4677b7960
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/d1_enc.c
View File

@@ -115,7 +115,9 @@
#include <stdio.h> #include <stdio.h>
#include "ssl_locl.h" #include "ssl_locl.h"
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h> #include <openssl/comp.h>
#endif
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/hmac.h> #include <openssl/hmac.h>
#include <openssl/md5.h> #include <openssl/md5.h>

3
ssl/ssl_ciph.c
View File

@@ -115,7 +115,10 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h> #include <openssl/comp.h>
#endif
#include "ssl_locl.h" #include "ssl_locl.h"
#define SSL_ENC_DES_IDX 0 #define SSL_ENC_DES_IDX 0

4
ssl/ssl_locl.h
View File

@@ -124,7 +124,9 @@
#include "e_os.h" #include "e_os.h"
#include <openssl/buffer.h> #include <openssl/buffer.h>
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h> #include <openssl/comp.h>
#endif
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/stack.h> #include <openssl/stack.h>
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
@@ -500,6 +502,7 @@ typedef struct ssl3_enc_method
int (*alert_value)(int); int (*alert_value)(int);
} SSL3_ENC_METHOD; } SSL3_ENC_METHOD;
#ifndef OPENSSL_NO_COMP
/* Used for holding the relevant compression methods loaded into SSL_CTX */ /* Used for holding the relevant compression methods loaded into SSL_CTX */
typedef struct ssl3_comp_st typedef struct ssl3_comp_st
{ {
@@ -507,6 +510,7 @@ typedef struct ssl3_comp_st
char *name; /* Text name used for the compression type */ char *name; /* Text name used for the compression type */
COMP_METHOD *method; /* The method :-) */ COMP_METHOD *method; /* The method :-) */
} SSL3_COMP; } SSL3_COMP;
#endif
extern SSL3_ENC_METHOD ssl3_undef_enc_method; extern SSL3_ENC_METHOD ssl3_undef_enc_method;
OPENSSL_EXTERN SSL_CIPHER ssl2_ciphers[]; OPENSSL_EXTERN SSL_CIPHER ssl2_ciphers[];

2
ssl/t1_enc.c
View File

@@ -111,7 +111,9 @@
#include <stdio.h> #include <stdio.h>
#include "ssl_locl.h" #include "ssl_locl.h"
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h> #include <openssl/comp.h>
#endif
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/hmac.h> #include <openssl/hmac.h>
#include <openssl/md5.h> #include <openssl/md5.h>