diff options
| author | doug <> | 2015-07-18 19:41:54 +0000 | 
|---|---|---|
| committer | doug <> | 2015-07-18 19:41:54 +0000 | 
| commit | 3100abf8a83f9dc563a4c846c2609eb7f3f4e185 (patch) | |
| tree | 36796e4558d127f54a2ea8088a9f89274f442edc /src/lib/libssl/s3_both.c | |
| parent | cd74a2dfb50e2b51fdd49889459fc393f05ec3d0 (diff) | |
| download | openbsd-3100abf8a83f9dc563a4c846c2609eb7f3f4e185.tar.gz openbsd-3100abf8a83f9dc563a4c846c2609eb7f3f4e185.tar.bz2 openbsd-3100abf8a83f9dc563a4c846c2609eb7f3f4e185.zip  | |
Remove SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER workaround.
This was a hack to work around problems on IE 6 with SSLv3.
ok miod@ bcook@
Diffstat (limited to 'src/lib/libssl/s3_both.c')
| -rw-r--r-- | src/lib/libssl/s3_both.c | 6 | 
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index a19ce74380..5a1d1e7443 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.42 2015/07/15 21:52:02 beck Exp $ */ | 1 | /* $OpenBSD: s3_both.c,v 1.43 2015/07/18 19:41:54 doug 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 | * | 
| @@ -647,10 +647,6 @@ ssl3_setup_read_buffer(SSL *s) | |||
| 647 | if (s->s3->rbuf.buf == NULL) { | 647 | if (s->s3->rbuf.buf == NULL) { | 
| 648 | len = SSL3_RT_MAX_PLAIN_LENGTH + | 648 | len = SSL3_RT_MAX_PLAIN_LENGTH + | 
| 649 | SSL3_RT_MAX_ENCRYPTED_OVERHEAD + headerlen + align; | 649 | SSL3_RT_MAX_ENCRYPTED_OVERHEAD + headerlen + align; | 
| 650 | if (s->options & SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER) { | ||
| 651 | s->s3->init_extra = 1; | ||
| 652 | len += SSL3_RT_MAX_EXTRA; | ||
| 653 | } | ||
| 654 | if ((p = malloc(len)) == NULL) | 650 | if ((p = malloc(len)) == NULL) | 
| 655 | goto err; | 651 | goto err; | 
| 656 | s->s3->rbuf.buf = p; | 652 | s->s3->rbuf.buf = p; | 
