projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move s->s3->wnum to s->rlayer.wnum
[openssl.git]
/
ssl
/
record
/
s3_pkt.c
diff --git
a/ssl/record/s3_pkt.c
b/ssl/record/s3_pkt.c
index f024ff58e60843c98ffd0709aec4b3a48da67b3f..30b5e37e81a1bfb04f79a3bf61f0d51a9c0b1923 100644
(file)
--- a/
ssl/record/s3_pkt.c
+++ b/
ssl/record/s3_pkt.c
@@
-434,9
+434,9
@@
int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
}
s->rwstate = SSL_NOTHING;
}
s->rwstate = SSL_NOTHING;
- OPENSSL_assert(s->
s3->
wnum <= INT_MAX);
- tot = s->
s3->
wnum;
- s->
s3->
wnum = 0;
+ OPENSSL_assert(s->
rlayer.
wnum <= INT_MAX);
+ tot = s->
rlayer.
wnum;
+ s->
rlayer.
wnum = 0;
if (SSL_in_init(s) && !s->in_handshake) {
i = s->handshake_func(s);
if (SSL_in_init(s) && !s->in_handshake) {
i = s->handshake_func(s);
@@
-470,7
+470,7
@@
int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
i = ssl3_write_pending(s, type, &buf[tot], s->s3->wpend_tot);
if (i <= 0) {
/* XXX should we ssl3_release_write_buffer if i<0? */
i = ssl3_write_pending(s, type, &buf[tot], s->s3->wpend_tot);
if (i <= 0) {
/* XXX should we ssl3_release_write_buffer if i<0? */
- s->
s3->
wnum = tot;
+ s->
rlayer.
wnum = tot;
return i;
}
tot += i; /* this might be last fragment */
return i;
}
tot += i; /* this might be last fragment */
@@
-531,7
+531,7
@@
int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
if (s->s3->alert_dispatch) {
i = s->method->ssl_dispatch_alert(s);
if (i <= 0) {
if (s->s3->alert_dispatch) {
i = s->method->ssl_dispatch_alert(s);
if (i <= 0) {
- s->
s3->
wnum = tot;
+ s->
rlayer.
wnum = tot;
return i;
}
}
return i;
}
}
@@
-590,7
+590,7
@@
int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
OPENSSL_free(wb->buf);
wb->buf = NULL;
}
OPENSSL_free(wb->buf);
wb->buf = NULL;
}
- s->
s3->
wnum = tot;
+ s->
rlayer.
wnum = tot;
return i;
}
if (i == (int)n) {
return i;
}
if (i == (int)n) {
@@
-620,7
+620,7
@@
int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
i = do_ssl3_write(s, type, &(buf[tot]), nw, 0);
if (i <= 0) {
/* XXX should we ssl3_release_write_buffer if i<0? */
i = do_ssl3_write(s, type, &(buf[tot]), nw, 0);
if (i <= 0) {
/* XXX should we ssl3_release_write_buffer if i<0? */
- s->
s3->
wnum = tot;
+ s->
rlayer.
wnum = tot;
return i;
}
return i;
}