kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable TLS 1.3 by default in bssl tool.

Browse Source 
Change-Id: I4b586dce37f4db0770e516888c2eeeae3ecffd97
Reviewed-on: https://boringssl-review.googlesource.com/13784
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Adam Langley 2017-02-09 15:30:52 -08:00 committed by CQ bot account: commit-bot@chromium.org
parent 7d7554b6b3
commit 040bc4944b
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tool/client.cc
View File

@ -282,16 +282,16 @@ bool Client(const std::vector<std::string> &args) {
return false; return false;
} }
if (args_map.count("-max-version") != 0) { uint16_t max_version = TLS1_3_VERSION;
uint16_t version; if (args_map.count("-max-version") != 0 &&
if (!VersionFromString(&version, args_map["-max-version"])) { !VersionFromString(&max_version, args_map["-max-version"])) {
fprintf(stderr, "Unknown protocol version: '%s'\n", fprintf(stderr, "Unknown protocol version: '%s'\n",
args_map["-max-version"].c_str()); args_map["-max-version"].c_str());
return false; return false;
} }
if (!SSL_CTX_set_max_proto_version(ctx.get(), version)) {
return false; if (!SSL_CTX_set_max_proto_version(ctx.get(), max_version)) {
} return false;
} }
if (args_map.count("-min-version") != 0) { if (args_map.count("-min-version") != 0) {

20
tool/server.cc
View File

@ -193,16 +193,16 @@ bool Server(const std::vector<std::string> &args) {
return false; return false;
} }
if (args_map.count("-max-version") != 0) { uint16_t max_version = TLS1_3_VERSION;
uint16_t version; if (args_map.count("-max-version") != 0 &&
if (!VersionFromString(&version, args_map["-max-version"])) { !VersionFromString(&max_version, args_map["-max-version"])) {
fprintf(stderr, "Unknown protocol version: '%s'\n", fprintf(stderr, "Unknown protocol version: '%s'\n",
args_map["-max-version"].c_str()); args_map["-max-version"].c_str());
return false; return false;
} }
if (!SSL_CTX_set_max_proto_version(ctx.get(), version)) {
return false; if (!SSL_CTX_set_max_proto_version(ctx.get(), max_version)) {
} return false;
} }
if (args_map.count("-min-version") != 0) { if (args_map.count("-min-version") != 0) {