diff options
| author | Matt Caswell <matt@openssl.org> | 2016-10-21 17:39:33 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-02 13:08:21 +0000 |
| commit | 582a17d662d123eafbb70c9eaaa140a2559b7cdb (patch) | |
| tree | dbdc271e94609b3095b676a93bac0f242692a1e9 /ssl/ssl_lib.c | |
| parent | ffd3d0ef34aac46c06379cc50d38c5c0324c3d4c (diff) | |
Add the SSL_METHOD for TLSv1.3 and all other base changes required
Includes addition of the various options to s_server/s_client. Also adds
one of the new TLS1.3 ciphersuites.
This isn't "real" TLS1.3!! It's identical to TLS1.2 apart from the protocol
and the ciphersuite...and the ciphersuite is just a renamed TLS1.2 one (not
a "real" TLS1.3 ciphersuite).
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 8bf872beec..84dd39371a 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -3072,7 +3072,9 @@ const SSL_METHOD *ssl_bad_method(int ver) const char *ssl_protocol_to_string(int version) { - if (version == TLS1_2_VERSION) + if (version == TLS1_3_VERSION) + return "TLSv1.3"; + else if (version == TLS1_2_VERSION) return "TLSv1.2"; else if (version == TLS1_1_VERSION) return "TLSv1.1"; |