diff options
| author | David Benjamin <davidben@google.com> | 2016-05-14 01:28:17 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2016-05-18 23:51:48 +0300 |
| commit | 1e6d6df943a681eb8454cf40b9cd554519156e16 (patch) | |
| tree | 708eec15b1b28cf126115f9269fa71873c3a2dd0 /ssl/d1_both.c | |
| parent | a6338be3fa1a08f53d6d5f80aa4f26629fd047ab (diff) | |
Remove state parameters to ssl3_get_message.
They're completely unused now. The handshake message reassembly logic should
not depend on the state machine. This should partially free it up (ugly as it
is) to be shared with a future TLS 1.3 implementation while, in parallel, it
and the layers below, get reworked. This also cuts down on the number of states
significantly.
Partially because I expect we'd want to get ssl_hash_message_t out of there
too. Having it in common code is fine, but it needs to be in the (supposed to
be) protocol-agnostic handshake state machine, not the protocol-specific
handshake message layer.
Change-Id: I12f9dc57bf433ceead0591106ab165d352ef6ee4
Reviewed-on: https://boringssl-review.googlesource.com/7949
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/d1_both.c')
| -rw-r--r-- | ssl/d1_both.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index 86fbe4a6..074668ca 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -558,7 +558,7 @@ static int dtls1_process_fragment(SSL *ssl) { /* dtls1_get_message reads a handshake message of message type |msg_type| (any * if |msg_type| == -1). Read an entire handshake message. Handshake messages * arrive in fragments. */ -long dtls1_get_message(SSL *ssl, int st1, int stn, int msg_type, +long dtls1_get_message(SSL *ssl, int msg_type, enum ssl_hash_message_t hash_message, int *ok) { pitem *item = NULL; hm_fragment *frag = NULL; @@ -646,7 +646,6 @@ long dtls1_get_message(SSL *ssl, int st1, int stn, int msg_type, pitem_free(item); dtls1_hm_fragment_free(frag); - ssl->state = stn; *ok = 1; return ssl->init_num; |