diff options
| author | Bodo Möller <bodo@openssl.org> | 2008-08-04 22:10:38 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2008-08-04 22:10:38 +0000 |
| commit | 474b3b1cc80a7c686d4a5fecc6836ec48c7c01d4 (patch) | |
| tree | 40e6d7b4773ebfd3bb6e3241b6f460a038932703 /ssl/ssl_lib.c | |
| parent | 3e727a3b378072f16b7e0fbd65fbd198d938242f (diff) | |
Fix error codes for memory-saving patch.
Also, get rid of compile-time switch OPENSSL_NO_RELEASE_BUFFERS
because it was rather pointless (the new behavior has to be explicitly
requested by setting SSL_MODE_RELEASE_BUFFERS anyway).
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 736423fd15..203bce661a 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1581,7 +1581,7 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth) ret->psk_client_callback=NULL; ret->psk_server_callback=NULL; #endif -#if !defined(OPENSSL_NO_BUF_FREELISTS) && !defined(OPENSSL_NO_RELEASE_BUFFERS) +#ifndef OPENSSL_NO_BUF_FREELISTS ret->freelist_max_len = SSL_MAX_BUF_FREELIST_LEN_DEFAULT; ret->rbuf_freelist = OPENSSL_malloc(sizeof(SSL3_BUF_FREELIST)); if (!ret->rbuf_freelist) @@ -1633,7 +1633,7 @@ static void SSL_COMP_free(SSL_COMP *comp) { OPENSSL_free(comp); } #endif -#if !defined(OPENSSL_NO_BUF_FREELISTS) && !defined(OPENSSL_NO_RELEASE_BUFFERS) +#ifndef OPENSSL_NO_BUF_FREELISTS static void ssl_buf_freelist_free(SSL3_BUF_FREELIST *list) { @@ -1714,7 +1714,7 @@ void SSL_CTX_free(SSL_CTX *a) ENGINE_finish(a->client_cert_engine); #endif -#if !defined(OPENSSL_NO_BUF_FREELISTS) && !defined(OPENSSL_NO_RELEASE_BUFFERS) +#ifndef OPENSSL_NO_BUF_FREELISTS if (a->wbuf_freelist) ssl_buf_freelist_free(a->wbuf_freelist); if (a->rbuf_freelist) |