diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2005-09-30 23:38:20 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2005-09-30 23:38:20 +0000 |
| commit | 54f51116b2fb12410fb17a1bfe6a400399e6456b (patch) | |
| tree | 003cb5f9abe8553139ba1ce48c78201cdea57c69 /ssl/ssl_lib.c | |
| parent | b0d90958fc13818ae3feb058b3320aaf678c0959 (diff) | |
Update from HEAD.
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 3df0f022d9..dfc1bad52a 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2246,6 +2246,7 @@ void ssl_clear_cipher_ctx(SSL *s) OPENSSL_free(s->enc_write_ctx); s->enc_write_ctx=NULL; } +#ifndef OPENSSL_NO_COMP if (s->expand != NULL) { COMP_CTX_free(s->expand); @@ -2256,6 +2257,7 @@ void ssl_clear_cipher_ctx(SSL *s) COMP_CTX_free(s->compress); s->compress=NULL; } +#endif } /* Fix this function so that it takes an optional type parameter */ @@ -2282,6 +2284,16 @@ SSL_CIPHER *SSL_get_current_cipher(const SSL *s) return(s->session->cipher); return(NULL); } +#ifdef OPENSSL_NO_COMP +const void *SSL_get_current_compression(SSL *s) + { + return NULL; + } +const void *SSL_get_current_expansion(SSL *s) + { + return NULL; + } +#else const COMP_METHOD *SSL_get_current_compression(SSL *s) { @@ -2296,6 +2308,7 @@ const COMP_METHOD *SSL_get_current_expansion(SSL *s) return(s->expand->meth); return(NULL); } +#endif int ssl_init_wbio_buffer(SSL *s,int push) { |