diff options
| author | Matt Caswell <matt@openssl.org> | 2017-11-03 16:38:48 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-12-14 15:06:37 +0000 |
| commit | 88050dd1960bfaba7ede12a3ce1afe40f5deb124 (patch) | |
| tree | 4f3f8bcce1f05fe4bf2b55068ad2112c7ce88fac /ssl/ssl_locl.h | |
| parent | 86b165e39fa94d4eceb9bb1611350b949fea7cc9 (diff) | |
Update ServerHello to new draft-22 format
The new ServerHello format is essentially now the same as the old TLSv1.2
one, but it must additionally include supported_versions. The version
field is fixed at TLSv1.2, and the version negotiation happens solely via
supported_versions.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4701)
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 952a8f9ccc..ed6b9a8fd4 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -2266,7 +2266,8 @@ __owur int ssl_check_version_downgrade(SSL *s); __owur int ssl_set_version_bound(int method_version, int version, int *bound); __owur int ssl_choose_server_version(SSL *s, CLIENTHELLO_MSG *hello, DOWNGRADE *dgrd); -__owur int ssl_choose_client_version(SSL *s, int version, int checkdgrd); +__owur int ssl_choose_client_version(SSL *s, int version, + RAW_EXTENSION *extensions); int ssl_get_min_max_version(const SSL *s, int *min_version, int *max_version); __owur long tls1_default_timeout(void); |