kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove remnants of DTLS renegotiate.

Browse Source 
BUG=429450

Change-Id: I94846d1fd377bc07044f916d0bb1880e219416df
Reviewed-on: https://boringssl-review.googlesource.com/4821
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-05-15 21:48:48 -04:00 committed by Adam Langley
parent 9a41d1b946
commit d23d5a5a8b
2 changed files with 8 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/d1_clnt.c
View File

@ -155,10 +155,6 @@ int dtls1_connect(SSL *s) {
state = s->state; state = s->state;
switch (s->state) { switch (s->state) {
case SSL_ST_RENEGOTIATE:
s->renegotiate = 1;
s->state = SSL_ST_CONNECT;
/* break */
case SSL_ST_CONNECT: case SSL_ST_CONNECT:
case SSL_ST_BEFORE | SSL_ST_CONNECT: case SSL_ST_BEFORE | SSL_ST_CONNECT:
if (cb != NULL) { if (cb != NULL) {

55
ssl/d1_srvr.c
View File

@ -159,10 +159,6 @@ int dtls1_accept(SSL *s) {
state = s->state; state = s->state;
switch (s->state) { switch (s->state) {
case SSL_ST_RENEGOTIATE:
s->renegotiate = 1;
/* s->state=SSL_ST_ACCEPT; */
case SSL_ST_ACCEPT: case SSL_ST_ACCEPT:
case SSL_ST_BEFORE | SSL_ST_ACCEPT: case SSL_ST_BEFORE | SSL_ST_ACCEPT:
if (cb != NULL) { if (cb != NULL) {
@ -181,49 +177,18 @@ int dtls1_accept(SSL *s) {
s->init_num = 0; s->init_num = 0;
if (s->state != SSL_ST_RENEGOTIATE) { if (!ssl_init_wbio_buffer(s, 1)) {
if (!ssl_init_wbio_buffer(s, 1)) { ret = -1;
ret = -1;
goto end;
}
if (!ssl3_init_finished_mac(s)) {
OPENSSL_PUT_ERROR(SSL, dtls1_accept, ERR_R_INTERNAL_ERROR);
ret = -1;
goto end;
}
s->state = SSL3_ST_SR_CLNT_HELLO_A;
} else {
/* s->state == SSL_ST_RENEGOTIATE, * we will just send a
* HelloRequest */
s->state = SSL3_ST_SW_HELLO_REQ_A;
}
break;
case SSL3_ST_SW_HELLO_REQ_A:
case SSL3_ST_SW_HELLO_REQ_B:
s->shutdown = 0;
dtls1_clear_record_buffer(s);
dtls1_start_timer(s);
ret = ssl3_send_hello_request(s);
if (ret <= 0) {
goto end; goto end;
} }
s->s3->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A;
s->state = SSL3_ST_SW_FLUSH;
s->init_num = 0;
if (!ssl3_init_finished_mac(s)) { if (!ssl3_init_finished_mac(s)) {
OPENSSL_PUT_ERROR(SSL, dtls1_accept, ERR_R_INTERNAL_ERROR); OPENSSL_PUT_ERROR(SSL, dtls1_accept, ERR_R_INTERNAL_ERROR);
ret = -1; ret = -1;
goto end; goto end;
} }
break;
case SSL3_ST_SW_HELLO_REQ_C: s->state = SSL3_ST_SR_CLNT_HELLO_A;
s->state = SSL_ST_OK;
break; break;
case SSL3_ST_SR_CLNT_HELLO_A: case SSL3_ST_SR_CLNT_HELLO_A:
@ -470,17 +435,13 @@ int dtls1_accept(SSL *s) {
ssl_free_wbio_buffer(s); ssl_free_wbio_buffer(s);
s->init_num = 0; s->init_num = 0;
s->renegotiate = 0;
s->s3->initial_handshake_complete = 1;
if (s->renegotiate == 2) { ssl_update_cache(s, SSL_SESS_CACHE_SERVER);
/* skipped if we just sent a HelloRequest */
s->renegotiate = 0;
s->s3->initial_handshake_complete = 1;
ssl_update_cache(s, SSL_SESS_CACHE_SERVER); if (cb != NULL) {
cb(s, SSL_CB_HANDSHAKE_DONE, 1);
if (cb != NULL) {
cb(s, SSL_CB_HANDSHAKE_DONE, 1);
}
} }
ret = 1; ret = 1;