diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-08 12:05:36 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-12 10:24:48 -0400 |
| commit | 9a555706a3fb8f6622e1049ab510a12f4e1bc6a2 (patch) | |
| tree | d13efcdaae67e53a1ae4688d6927f406ada913ab /ssl/ssl_locl.h | |
| parent | 253617806da0aeb0cea1fedf6136460fb4993eae (diff) | |
Make COMP_CTX and COMP_METHOD opaque
Since COMP_METHOD is now defined in comp_lcl.h, it is no
longer possible to create new TLS compression methods without
using the OpenSSL source. Only ZLIB is supported by default.
Also, since the types are opaque, #ifdef guards to use "char *"
instead of the real type aren't necessary.
The changes are actually minor. Adding missing copyright to some
files makes the diff misleadingly big.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 9ae1a0711b..64feb840a2 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -705,15 +705,12 @@ typedef struct srp_ctx_st { # endif +typedef struct ssl_comp_st SSL_COMP; struct ssl_comp_st { int id; const char *name; -# ifndef OPENSSL_NO_COMP COMP_METHOD *method; -# else - char *method; -# endif }; DECLARE_STACK_OF(SSL_COMP) @@ -1045,18 +1042,10 @@ struct ssl_st { int mac_flags; EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */ EVP_MD_CTX *read_hash; /* used for mac generation */ -# ifndef OPENSSL_NO_COMP + COMP_CTX *compress; /* compression */ COMP_CTX *expand; /* uncompress */ -# else - char *expand; -# endif EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */ EVP_MD_CTX *write_hash; /* used for mac generation */ -# ifndef OPENSSL_NO_COMP - COMP_CTX *compress; /* compression */ -# else - char *compress; -# endif /* session info */ /* client cert? */ /* This is used to hold the server certificate used */ @@ -1357,11 +1346,7 @@ typedef struct ssl3_state_st { struct dtls1_retransmit_state { EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */ EVP_MD_CTX *write_hash; /* used for mac generation */ -# ifndef OPENSSL_NO_COMP COMP_CTX *compress; /* compression */ -# else - char *compress; -# endif SSL_SESSION *session; unsigned short epoch; }; |