diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-09 15:29:45 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-02-17 10:28:00 +0000 |
| commit | 8cdc8c5105dfa94f1b62265900a1e238f17ac562 (patch) | |
| tree | 27c461cb0dd2053f514f568f482d18e690d844ce /ssl | |
| parent | b07b2a1b44a26909c9e89435ae417e0d30ca6951 (diff) | |
| download | openssl-8cdc8c5105dfa94f1b62265900a1e238f17ac562.tar.gz | |
Add the ability for a server to receive a KeyUpdate message
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2609)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/statem/statem_srvr.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 4cdd6c9492..2a21001086 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -132,6 +132,13 @@ static int ossl_statem_server13_read_transition(SSL *s, int mt) return 1; } break; + + case TLS_ST_OK: + if (mt == SSL3_MT_KEY_UPDATE) { + st->hand_state = TLS_ST_SR_KEY_UPDATE; + return 1; + } + break; } /* No valid transition found */ @@ -408,7 +415,8 @@ static WRITE_TRAN ossl_statem_server13_write_transition(SSL *s) st->hand_state = TLS_ST_SW_KEY_UPDATE; return WRITE_TRAN_CONTINUE; } - return WRITE_TRAN_ERROR; + /* Try to read from the client instead */ + return WRITE_TRAN_FINISHED; case TLS_ST_SR_CLNT_HELLO: if (s->hello_retry_request) @@ -461,6 +469,7 @@ static WRITE_TRAN ossl_statem_server13_write_transition(SSL *s) st->hand_state = TLS_ST_SW_SESSION_TICKET; return WRITE_TRAN_CONTINUE; + case TLS_ST_SR_KEY_UPDATE: case TLS_ST_SW_KEY_UPDATE: case TLS_ST_SW_SESSION_TICKET: st->hand_state = TLS_ST_OK; @@ -992,6 +1001,9 @@ size_t ossl_statem_server_max_message_size(SSL *s) case TLS_ST_SR_FINISHED: return FINISHED_MAX_LENGTH; + + case TLS_ST_SR_KEY_UPDATE: + return KEY_UPDATE_MAX_LENGTH; } } @@ -1029,6 +1041,10 @@ MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL *s, PACKET *pkt) case TLS_ST_SR_FINISHED: return tls_process_finished(s, pkt); + + case TLS_ST_SR_KEY_UPDATE: + return tls_process_key_update(s, pkt); + } } |