wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure SSL_in_init() returns 0 at SSL_CB_HANDSHAKE_DONE

Browse source 
In 1.1.0 and before calling SSL_in_init() from the info_callback
at SSL_CB_HANDSHAKE_DONE would return 0. This commit fixes it so
that it does again for 1.1.1. This broke Node.

Fixes #4574

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6019)
This commit is contained in:
Matt Caswell 2018-04-19 15:26:28 +01:00
parent 4b7c6385f7
commit 4ce787b97a
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ssl/statem/statem_lib.c
View file

@ -1090,13 +1090,18 @@ WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop)
else if (s->ctx->info_callback != NULL) else if (s->ctx->info_callback != NULL)
cb = s->ctx->info_callback; cb = s->ctx->info_callback;
/* The callback may expect us to not be in init at handshake done */
ossl_statem_set_in_init(s, 0);
if (cb != NULL) if (cb != NULL)
cb(s, SSL_CB_HANDSHAKE_DONE, 1); cb(s, SSL_CB_HANDSHAKE_DONE, 1);
if (!stop) if (!stop) {
/* If we've got more work to do we go back into init */
ossl_statem_set_in_init(s, 1);
return WORK_FINISHED_CONTINUE; return WORK_FINISHED_CONTINUE;
}
ossl_statem_set_in_init(s, 0);
return WORK_FINISHED_STOP; return WORK_FINISHED_STOP;
} }