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/s3_both.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/s3_both.c')
| -rw-r--r-- | ssl/s3_both.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_both.c b/ssl/s3_both.c index 88bed0fa6b..06e761b4b2 100644 --- a/ssl/s3_both.c +++ b/ssl/s3_both.c @@ -591,7 +591,7 @@ int ssl_verify_alarm_type(long type) return(al); } -#if !defined(OPENSSL_NO_BUF_FREELISTS) && !defined(OPENSSL_NO_RELEASE_BUFFERS) +#ifndef OPENSSL_NO_BUF_FREELISTS /* On some platforms, malloc() performance is bad enough that you can't just * free() and malloc() buffers all the time, so we need to use freelists from * unused buffers. Currently, each freelist holds memory chunks of only a @@ -698,7 +698,7 @@ int ssl3_setup_read_buffer(SSL *s) return 1; err: - SSLerr(SSL_F_SSL3_SETUP_BUFFERS,ERR_R_MALLOC_FAILURE); + SSLerr(SSL_F_SSL3_SETUP_READ_BUFFER,ERR_R_MALLOC_FAILURE); return 0; } @@ -733,7 +733,7 @@ int ssl3_setup_write_buffer(SSL *s) return 1; err: - SSLerr(SSL_F_SSL3_SETUP_BUFFERS,ERR_R_MALLOC_FAILURE); + SSLerr(SSL_F_SSL3_SETUP_WRITE_BUFFER,ERR_R_MALLOC_FAILURE); return 0; } |