diff options
Diffstat (limited to 'src/lib/libssl/s3_both.c')
-rw-r--r-- | src/lib/libssl/s3_both.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index 2da6b527e1..500387e372 100644 --- a/src/lib/libssl/s3_both.c +++ b/src/lib/libssl/s3_both.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_both.c,v 1.25 2014/06/19 21:29:51 tedu Exp $ */ | 1 | /* $OpenBSD: s3_both.c,v 1.26 2014/07/10 08:51:14 tedu Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -287,7 +287,6 @@ f_err: | |||
287 | * ssl->s3->read_sequence zero | 287 | * ssl->s3->read_sequence zero |
288 | * ssl->s3->read_mac_secret re-init | 288 | * ssl->s3->read_mac_secret re-init |
289 | * ssl->session->read_sym_enc assign | 289 | * ssl->session->read_sym_enc assign |
290 | * ssl->session->read_compression assign | ||
291 | * ssl->session->read_hash assign | 290 | * ssl->session->read_hash assign |
292 | */ | 291 | */ |
293 | int | 292 | int |
@@ -640,10 +639,6 @@ ssl3_setup_read_buffer(SSL *s) | |||
640 | s->s3->init_extra = 1; | 639 | s->s3->init_extra = 1; |
641 | len += SSL3_RT_MAX_EXTRA; | 640 | len += SSL3_RT_MAX_EXTRA; |
642 | } | 641 | } |
643 | #ifndef OPENSSL_NO_COMP | ||
644 | if (!(s->options & SSL_OP_NO_COMPRESSION)) | ||
645 | len += SSL3_RT_MAX_COMPRESSED_OVERHEAD; | ||
646 | #endif | ||
647 | if ((p = malloc(len)) == NULL) | 642 | if ((p = malloc(len)) == NULL) |
648 | goto err; | 643 | goto err; |
649 | s->s3->rbuf.buf = p; | 644 | s->s3->rbuf.buf = p; |
@@ -676,10 +671,6 @@ ssl3_setup_write_buffer(SSL *s) | |||
676 | if (s->s3->wbuf.buf == NULL) { | 671 | if (s->s3->wbuf.buf == NULL) { |
677 | len = s->max_send_fragment + | 672 | len = s->max_send_fragment + |
678 | SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD + headerlen + align; | 673 | SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD + headerlen + align; |
679 | #ifndef OPENSSL_NO_COMP | ||
680 | if (!(s->options & SSL_OP_NO_COMPRESSION)) | ||
681 | len += SSL3_RT_MAX_COMPRESSED_OVERHEAD; | ||
682 | #endif | ||
683 | if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS)) | 674 | if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS)) |
684 | len += headerlen + align + | 675 | len += headerlen + align + |
685 | SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD; | 676 | SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD; |