From 61af17199189570a4400f2757a9e8dab4bb76d2a Mon Sep 17 00:00:00 2001 From: beck <> Date: Mon, 23 Jan 2017 08:48:45 +0000 Subject: send state and rstate from ssl_st into internal. There are accessors so these should not be diddled with directly ok jsing@ --- src/lib/libssl/d1_clnt.c | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/lib/libssl/d1_clnt.c') diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c index 5a972f3292..9319794a66 100644 --- a/src/lib/libssl/d1_clnt.c +++ b/src/lib/libssl/d1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_clnt.c,v 1.66 2017/01/23 06:45:30 beck Exp $ */ +/* $OpenBSD: d1_clnt.c,v 1.67 2017/01/23 08:48:44 beck Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -199,12 +199,12 @@ dtls1_connect(SSL *s) for (;;) { - state = s->state; + state = s->internal->state; - switch (s->state) { + switch (s->internal->state) { case SSL_ST_RENEGOTIATE: s->internal->renegotiate = 1; - s->state = SSL_ST_CONNECT; + s->internal->state = SSL_ST_CONNECT; s->ctx->internal->stats.sess_connect_renegotiate++; /* break */ case SSL_ST_BEFORE: @@ -241,7 +241,7 @@ dtls1_connect(SSL *s) /* don't push the buffering BIO quite yet */ - s->state = SSL3_ST_CW_CLNT_HELLO_A; + s->internal->state = SSL3_ST_CW_CLNT_HELLO_A; s->ctx->internal->stats.sess_connect++; s->internal->init_num = 0; /* mark client_random uninitialized */ @@ -269,10 +269,10 @@ dtls1_connect(SSL *s) goto end; if (D1I(s)->send_cookie) { - s->state = SSL3_ST_CW_FLUSH; + s->internal->state = SSL3_ST_CW_FLUSH; S3I(s)->tmp.next_state = SSL3_ST_CR_SRVR_HELLO_A; } else - s->state = SSL3_ST_CR_SRVR_HELLO_A; + s->internal->state = SSL3_ST_CR_SRVR_HELLO_A; s->internal->init_num = 0; @@ -290,9 +290,9 @@ dtls1_connect(SSL *s) else { if (s->internal->hit) { - s->state = SSL3_ST_CR_FINISHED_A; + s->internal->state = SSL3_ST_CR_FINISHED_A; } else - s->state = DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A; + s->internal->state = DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A; } s->internal->init_num = 0; break; @@ -305,9 +305,9 @@ dtls1_connect(SSL *s) goto end; dtls1_stop_timer(s); if ( D1I(s)->send_cookie) /* start again, with a cookie */ - s->state = SSL3_ST_CW_CLNT_HELLO_A; + s->internal->state = SSL3_ST_CW_CLNT_HELLO_A; else - s->state = SSL3_ST_CR_CERT_A; + s->internal->state = SSL3_ST_CR_CERT_A; s->internal->init_num = 0; break; @@ -319,9 +319,9 @@ dtls1_connect(SSL *s) if (ret == 2) { s->internal->hit = 1; if (s->internal->tlsext_ticket_expected) - s->state = SSL3_ST_CR_SESSION_TICKET_A; + s->internal->state = SSL3_ST_CR_SESSION_TICKET_A; else - s->state = SSL3_ST_CR_FINISHED_A; + s->internal->state = SSL3_ST_CR_FINISHED_A; s->internal->init_num = 0; break; } @@ -332,12 +332,12 @@ dtls1_connect(SSL *s) if (ret <= 0) goto end; if (s->internal->tlsext_status_expected) - s->state = SSL3_ST_CR_CERT_STATUS_A; + s->internal->state = SSL3_ST_CR_CERT_STATUS_A; else - s->state = SSL3_ST_CR_KEY_EXCH_A; + s->internal->state = SSL3_ST_CR_KEY_EXCH_A; } else { skip = 1; - s->state = SSL3_ST_CR_KEY_EXCH_A; + s->internal->state = SSL3_ST_CR_KEY_EXCH_A; } s->internal->init_num = 0; break; @@ -347,7 +347,7 @@ dtls1_connect(SSL *s) ret = ssl3_get_server_key_exchange(s); if (ret <= 0) goto end; - s->state = SSL3_ST_CR_CERT_REQ_A; + s->internal->state = SSL3_ST_CR_CERT_REQ_A; s->internal->init_num = 0; /* at this point we check that we have the @@ -363,7 +363,7 @@ dtls1_connect(SSL *s) ret = ssl3_get_certificate_request(s); if (ret <= 0) goto end; - s->state = SSL3_ST_CR_SRVR_DONE_A; + s->internal->state = SSL3_ST_CR_SRVR_DONE_A; s->internal->init_num = 0; break; @@ -378,7 +378,7 @@ dtls1_connect(SSL *s) else S3I(s)->tmp.next_state = SSL3_ST_CW_KEY_EXCH_A; s->internal->init_num = 0; - s->state = S3I(s)->tmp.next_state; + s->internal->state = S3I(s)->tmp.next_state; break; case SSL3_ST_CW_CERT_A: @@ -389,7 +389,7 @@ dtls1_connect(SSL *s) ret = ssl3_send_client_certificate(s); if (ret <= 0) goto end; - s->state = SSL3_ST_CW_KEY_EXCH_A; + s->internal->state = SSL3_ST_CW_KEY_EXCH_A; s->internal->init_num = 0; break; @@ -405,9 +405,9 @@ dtls1_connect(SSL *s) /* For TLS, cert_req is set to 2, so a cert chain * of nothing is sent, but no verify packet is sent */ if (S3I(s)->tmp.cert_req == 1) { - s->state = SSL3_ST_CW_CERT_VRFY_A; + s->internal->state = SSL3_ST_CW_CERT_VRFY_A; } else { - s->state = SSL3_ST_CW_CHANGE_A; + s->internal->state = SSL3_ST_CW_CHANGE_A; S3I(s)->change_cipher_spec = 0; } @@ -420,7 +420,7 @@ dtls1_connect(SSL *s) ret = ssl3_send_client_verify(s); if (ret <= 0) goto end; - s->state = SSL3_ST_CW_CHANGE_A; + s->internal->state = SSL3_ST_CW_CHANGE_A; s->internal->init_num = 0; S3I(s)->change_cipher_spec = 0; break; @@ -434,7 +434,7 @@ dtls1_connect(SSL *s) if (ret <= 0) goto end; - s->state = SSL3_ST_CW_FINISHED_A; + s->internal->state = SSL3_ST_CW_FINISHED_A; s->internal->init_num = 0; s->session->cipher = S3I(s)->tmp.new_cipher; @@ -463,14 +463,14 @@ dtls1_connect(SSL *s) s->method->ssl3_enc->client_finished_label_len); if (ret <= 0) goto end; - s->state = SSL3_ST_CW_FLUSH; + s->internal->state = SSL3_ST_CW_FLUSH; /* clear flags */ s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER; if (s->internal->hit) { S3I(s)->tmp.next_state = SSL_ST_OK; if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED) { - s->state = SSL_ST_OK; + s->internal->state = SSL_ST_OK; s->s3->flags |= SSL3_FLAGS_POP_BUFFER; S3I(s)->delay_buf_pop_ret = 0; } @@ -492,7 +492,7 @@ dtls1_connect(SSL *s) ret = ssl3_get_new_session_ticket(s); if (ret <= 0) goto end; - s->state = SSL3_ST_CR_FINISHED_A; + s->internal->state = SSL3_ST_CR_FINISHED_A; s->internal->init_num = 0; break; @@ -501,7 +501,7 @@ dtls1_connect(SSL *s) ret = ssl3_get_cert_status(s); if (ret <= 0) goto end; - s->state = SSL3_ST_CR_KEY_EXCH_A; + s->internal->state = SSL3_ST_CR_KEY_EXCH_A; s->internal->init_num = 0; break; @@ -515,9 +515,9 @@ dtls1_connect(SSL *s) dtls1_stop_timer(s); if (s->internal->hit) - s->state = SSL3_ST_CW_CHANGE_A; + s->internal->state = SSL3_ST_CW_CHANGE_A; else - s->state = SSL_ST_OK; + s->internal->state = SSL_ST_OK; s->internal->init_num = 0; @@ -529,14 +529,14 @@ dtls1_connect(SSL *s) /* If the write error was fatal, stop trying */ if (!BIO_should_retry(s->wbio)) { s->internal->rwstate = SSL_NOTHING; - s->state = S3I(s)->tmp.next_state; + s->internal->state = S3I(s)->tmp.next_state; } ret = -1; goto end; } s->internal->rwstate = SSL_NOTHING; - s->state = S3I(s)->tmp.next_state; + s->internal->state = S3I(s)->tmp.next_state; break; case SSL_ST_OK: @@ -585,11 +585,11 @@ dtls1_connect(SSL *s) goto end; } - if ((cb != NULL) && (s->state != state)) { - new_state = s->state; - s->state = state; + if ((cb != NULL) && (s->internal->state != state)) { + new_state = s->internal->state; + s->internal->state = state; cb(s, SSL_CB_CONNECT_LOOP, 1); - s->state = new_state; + s->internal->state = new_state; } } skip = 0; -- cgit v1.2.3-55-g6feb