diff options
| author | Matt Caswell <matt@openssl.org> | 2018-09-07 15:17:34 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-09-07 18:24:59 +0100 |
| commit | f01344cb5c6239af0d406f48d65362d0df9627b5 (patch) | |
| tree | 54f51286ca17243df77c04cc82cb3ad5222a0228 /test/build.info | |
| parent | 328a0547ad61d9e260fca73a280d2288714f2b92 (diff) | |
Do not reset SNI data in SSL_do_handshake()
PR #3783 introduce coded to reset the server side SNI state in
SSL_do_handshake() to ensure any erroneous config time SNI changes are
cleared. Unfortunately SSL_do_handshake() can be called mid-handshake
multiple times so this is the wrong place to do this and can mean that
any SNI data is cleared later on in the handshake too.
Therefore move the code to a more appropriate place.
Fixes #7014
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/7149)
Diffstat (limited to 'test/build.info')
| -rw-r--r-- | test/build.info | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/build.info b/test/build.info index 04014e7286..2c02ecc040 100644 --- a/test/build.info +++ b/test/build.info @@ -364,7 +364,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN INCLUDE[ciphername_test]=../include DEPEND[ciphername_test]=../libcrypto ../libssl libtestutil.a - SOURCE[servername_test]=servername_test.c + SOURCE[servername_test]=servername_test.c ssltestlib.c INCLUDE[servername_test]=../include DEPEND[servername_test]=../libcrypto ../libssl libtestutil.a |