diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-21 17:14:42 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-02 17:44:15 +0000 |
| commit | d781d247d1ef9331983f456d616659108c857d0d (patch) | |
| tree | 2aebc8129fb1e92324bd552382dde0e0d2920372 /ssl/statem/statem.c | |
| parent | 6cb422654de11eb13f50b36d7d59e65fec029229 (diff) | |
Provide an SSL_read_early() function for reading early data
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2737)
Diffstat (limited to 'ssl/statem/statem.c')
| -rw-r--r-- | ssl/statem/statem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index 9ec8e85426..26c9273210 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -326,7 +326,8 @@ static int state_machine(SSL *s, int server) } if ((SSL_IS_FIRST_HANDSHAKE(s) - && s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING) + && s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING + && s->early_data_state != SSL_EARLY_DATA_FINISHED_READING) || s->renegotiate) { if (!tls_setup_handshake(s)) { ossl_statem_set_error(s); |