diff options
| author | Matt Caswell <matt@openssl.org> | 2019-09-25 17:06:06 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-01-30 16:01:25 +0000 |
| commit | 7955c1f16e72dc944677fd1dbf4b1300e75f1c84 (patch) | |
| tree | 2dfb5eddd2b01bf6422ecb077d2fd7a4eed00a59 /ssl/statem/extensions.c | |
| parent | 68229aebce159ecea7b887d6a0edd47d881a659b (diff) | |
Fix SSL_get_servername() and SNI behaviour
The SNI behaviour for TLSv1.3 and the behaviour of SSL_get_servername()
was not quite right, and not entirely consistent with the RFC.
The TLSv1.3 RFC explicitly says that SNI is negotiated on each handshake
and the server is not required to associate it with the session. This was
not quite reflected in the code so we fix that.
Additionally there were some additional checks around early_data checking
that the SNI between the original session and this session were
consistent. In fact the RFC does not require any such checks, so they are
removed.
Finally the behaviour of SSL_get_servername() was not quite right. The
behaviour was not consistent between resumption and normal handshakes,
and also not quite consistent with historical behaviour. We clarify the
behaviour in various scenarios and also attempt to make it match historical
behaviour as closely as possible.
Fixes #8822
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/10018)
Diffstat (limited to 'ssl/statem/extensions.c')
| -rw-r--r-- | ssl/statem/extensions.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index e2e704543e..d37accac18 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -948,7 +948,6 @@ static int final_server_name(SSL *s, unsigned int context, int sent) * was successful. */ if (s->server) { - /* TODO(OpenSSL1.2) revisit !sent case */ if (sent && ret == SSL_TLSEXT_ERR_OK && !s->hit) { /* Only store the hostname in the session if we accepted it. */ OPENSSL_free(s->session->ext.hostname); |