diff options
Diffstat (limited to 'src/lib/libssl/s3_pkt.c')
| -rw-r--r-- | src/lib/libssl/s3_pkt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c index 40ab55b6ee..a9737a7f40 100644 --- a/src/lib/libssl/s3_pkt.c +++ b/src/lib/libssl/s3_pkt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s3_pkt.c,v 1.67 2017/01/23 13:36:13 jsing Exp $ */ | 1 | /* $OpenBSD: s3_pkt.c,v 1.68 2017/01/23 14:35:42 jsing 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 | * |
| @@ -238,7 +238,7 @@ ssl3_read_n(SSL *s, int n, int max, int extend) | |||
| 238 | 238 | ||
| 239 | if (i <= 0) { | 239 | if (i <= 0) { |
| 240 | rb->left = left; | 240 | rb->left = left; |
| 241 | if (s->mode & SSL_MODE_RELEASE_BUFFERS && | 241 | if (s->internal->mode & SSL_MODE_RELEASE_BUFFERS && |
| 242 | !SSL_IS_DTLS(s)) { | 242 | !SSL_IS_DTLS(s)) { |
| 243 | if (len + left == 0) | 243 | if (len + left == 0) |
| 244 | ssl3_release_read_buffer(s); | 244 | ssl3_release_read_buffer(s); |
| @@ -540,7 +540,7 @@ ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) | |||
| 540 | } | 540 | } |
| 541 | 541 | ||
| 542 | if ((i == (int)n) || (type == SSL3_RT_APPLICATION_DATA && | 542 | if ((i == (int)n) || (type == SSL3_RT_APPLICATION_DATA && |
| 543 | (s->mode & SSL_MODE_ENABLE_PARTIAL_WRITE))) { | 543 | (s->internal->mode & SSL_MODE_ENABLE_PARTIAL_WRITE))) { |
| 544 | /* | 544 | /* |
| 545 | * Next chunk of data should get another prepended | 545 | * Next chunk of data should get another prepended |
| 546 | * empty fragment in ciphersuites with known-IV | 546 | * empty fragment in ciphersuites with known-IV |
| @@ -770,7 +770,7 @@ ssl3_write_pending(SSL *s, int type, const unsigned char *buf, unsigned int len) | |||
| 770 | 770 | ||
| 771 | /* XXXX */ | 771 | /* XXXX */ |
| 772 | if ((S3I(s)->wpend_tot > (int)len) || ((S3I(s)->wpend_buf != buf) && | 772 | if ((S3I(s)->wpend_tot > (int)len) || ((S3I(s)->wpend_buf != buf) && |
| 773 | !(s->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER)) || | 773 | !(s->internal->mode & SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER)) || |
| 774 | (S3I(s)->wpend_type != type)) { | 774 | (S3I(s)->wpend_type != type)) { |
| 775 | SSLerr(SSL_F_SSL3_WRITE_PENDING, SSL_R_BAD_WRITE_RETRY); | 775 | SSLerr(SSL_F_SSL3_WRITE_PENDING, SSL_R_BAD_WRITE_RETRY); |
| 776 | return (-1); | 776 | return (-1); |
| @@ -790,7 +790,7 @@ ssl3_write_pending(SSL *s, int type, const unsigned char *buf, unsigned int len) | |||
| 790 | if (i == wb->left) { | 790 | if (i == wb->left) { |
| 791 | wb->left = 0; | 791 | wb->left = 0; |
| 792 | wb->offset += i; | 792 | wb->offset += i; |
| 793 | if (s->mode & SSL_MODE_RELEASE_BUFFERS && | 793 | if (s->internal->mode & SSL_MODE_RELEASE_BUFFERS && |
| 794 | !SSL_IS_DTLS(s)) | 794 | !SSL_IS_DTLS(s)) |
| 795 | ssl3_release_write_buffer(s); | 795 | ssl3_release_write_buffer(s); |
| 796 | s->internal->rwstate = SSL_NOTHING; | 796 | s->internal->rwstate = SSL_NOTHING; |
| @@ -983,7 +983,7 @@ start: | |||
| 983 | if (rr->length == 0) { | 983 | if (rr->length == 0) { |
| 984 | s->internal->rstate = SSL_ST_READ_HEADER; | 984 | s->internal->rstate = SSL_ST_READ_HEADER; |
| 985 | rr->off = 0; | 985 | rr->off = 0; |
| 986 | if (s->mode & SSL_MODE_RELEASE_BUFFERS && | 986 | if (s->internal->mode & SSL_MODE_RELEASE_BUFFERS && |
| 987 | s->s3->rbuf.left == 0) | 987 | s->s3->rbuf.left == 0) |
| 988 | ssl3_release_read_buffer(s); | 988 | ssl3_release_read_buffer(s); |
| 989 | } | 989 | } |
| @@ -1068,7 +1068,7 @@ start: | |||
| 1068 | return (-1); | 1068 | return (-1); |
| 1069 | } | 1069 | } |
| 1070 | 1070 | ||
| 1071 | if (!(s->mode & SSL_MODE_AUTO_RETRY)) { | 1071 | if (!(s->internal->mode & SSL_MODE_AUTO_RETRY)) { |
| 1072 | if (s->s3->rbuf.left == 0) { | 1072 | if (s->s3->rbuf.left == 0) { |
| 1073 | /* no read-ahead left? */ | 1073 | /* no read-ahead left? */ |
| 1074 | /* In the case where we try to read application data, | 1074 | /* In the case where we try to read application data, |
| @@ -1230,7 +1230,7 @@ start: | |||
| 1230 | return (-1); | 1230 | return (-1); |
| 1231 | } | 1231 | } |
| 1232 | 1232 | ||
| 1233 | if (!(s->mode & SSL_MODE_AUTO_RETRY)) { | 1233 | if (!(s->internal->mode & SSL_MODE_AUTO_RETRY)) { |
| 1234 | if (s->s3->rbuf.left == 0) { /* no read-ahead left? */ | 1234 | if (s->s3->rbuf.left == 0) { /* no read-ahead left? */ |
| 1235 | BIO *bio; | 1235 | BIO *bio; |
| 1236 | /* In the case where we try to read application data, | 1236 | /* In the case where we try to read application data, |
