Move s->rstate to s->rlayer.rstate

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell
2015-02-03 10:48:28 +00:00
parent 7a7048aff0
commit 295c3f4111
8 changed files with 79 additions and 64 deletions

View File

@@ -215,7 +215,6 @@ int SSL_clear(SSL *s)
s->version = s->method->version;
s->client_version = s->version;
s->rwstate = SSL_NOTHING;
s->rstate = SSL_ST_READ_HEADER;
if (s->init_buf != NULL) {
BUF_MEM_free(s->init_buf);
@@ -2830,7 +2829,7 @@ SSL *SSL_dup(SSL *s)
ret->shutdown = s->shutdown;
ret->state = s->state; /* SSL_dup does not really work at any state,
* though */
ret->rstate = s->rstate;
RECORD_LAYER_dup(&ret->rlayer, &s->rlayer);
ret->init_num = 0; /* would have to copy ret->init_buf,
* ret->init_msg, ret->init_num,
* ret->init_off */