diff options
author | Matt Caswell <matt@openssl.org> | 2017-11-14 13:43:42 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-11-21 17:46:22 +0000 |
commit | b510b740fb4e3cb35e6f297c232c0e776dbcbc71 (patch) | |
tree | 9a09541f64b2eb719a1a08f9f5b5018e1db18749 /apps/s_client.c | |
parent | 665d899fa6d3571da016925067ebcf1789d7d19c (diff) |
Ignore the session when setting SNI in s_client
As per this comment:
https://github.com/openssl/openssl/issues/4496#issuecomment-337767145
Since the server is entitled to reject our session our ClientHello
should include everything that we would want if a full handshake were
to happen. Therefore we shouldn't use the session as a source of
information for setting SNI.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4738)
Diffstat (limited to 'apps/s_client.c')
-rw-r--r-- | apps/s_client.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 7c0639faad..fcab44cb56 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1923,18 +1923,7 @@ int s_client_main(int argc, char **argv) ERR_print_errors(bio_err); goto end; } - /* By default the SNI should be the same as was set in the session */ - if (!noservername && servername == NULL) { - servername = SSL_SESSION_get0_hostname(sess); - if (servername == NULL) { - /* - * Force no SNI to be sent so we are consistent with the - * session. - */ - noservername = 1; - } - } SSL_SESSION_free(sess); } |