diff options
author | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2001-02-19 16:06:34 +0000 |
commit | cf1b7d96647d55e533f779e476e3d4371f40445a (patch) | |
tree | f7d6534cf77223190eaefe68d9e192d3d1246206 /ssl/ssl3.h | |
parent | 649c5a2b096e89692b07dbbe19d2dbb12a9db075 (diff) |
Make all configuration macros available for application by making
sure they are available in opensslconf.h, by giving them names starting
with "OPENSSL_" to avoid conflicts with other packages and by making
sure e_os2.h will cover all platform-specific cases together with
opensslconf.h.
I've checked fairly well that nothing breaks with this (apart from
external software that will adapt if they have used something like
NO_KRB5), but I can't guarantee it completely, so a review of this
change would be a good thing.
Diffstat (limited to 'ssl/ssl3.h')
-rw-r--r-- | ssl/ssl3.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ssl/ssl3.h b/ssl/ssl3.h index 4d62ba52b9..0528588aa9 100644 --- a/ssl/ssl3.h +++ b/ssl/ssl3.h @@ -59,7 +59,7 @@ #ifndef HEADER_SSL3_H #define HEADER_SSL3_H -#ifndef NO_COMP +#ifndef OPENSSL_NO_COMP #include <openssl/comp.h> #endif #include <openssl/buffer.h> @@ -165,7 +165,8 @@ extern "C" { #define SSL3_RT_HEADER_LENGTH 5 /* Due to MS stuffing up, this can change.... */ -#if defined(WIN16) || (defined(MSDOS) && !defined(WIN32)) +#if defined(OPENSSL_SYS_WIN16) || \ + (defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)) #define SSL3_RT_MAX_EXTRA (14000) #else #define SSL3_RT_MAX_EXTRA (16384) @@ -308,7 +309,7 @@ typedef struct ssl3_state_st /* used to hold the new cipher we are going to use */ SSL_CIPHER *new_cipher; -#ifndef NO_DH +#ifndef OPENSSL_NO_DH DH *dh; #endif /* used when SSL_ST_FLUSH_DATA is entered */ @@ -329,7 +330,7 @@ typedef struct ssl3_state_st const EVP_CIPHER *new_sym_enc; const EVP_MD *new_hash; -#ifndef NO_COMP +#ifndef OPENSSL_NO_COMP const SSL_COMP *new_compression; #else char *new_compression; |