commit 040bc4944be97f5d4b44da176f6e801fc804a176
author Adam Langley <agl@google.com> Thu Feb 09 15:30:52 2017 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Sat Feb 11 16:12:31 2017 +0000
tree 1d930b65134c18ebd7a6ca4d937fcdd6ead2a4f3
parent 7d7554b6b3c79e707e25521e61e066ce2b996e4c

Enable TLS 1.3 by default in bssl tool.

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>

tool/client.cc

diff --git a/tool/client.cc b/tool/client.cc
index 0301a81..8e0ef2d 100644
--- a/tool/client.cc
+++ b/tool/client.cc
@@ -282,16 +282,16 @@
     return false;
   }
 
-  if (args_map.count("-max-version") != 0) {
-    uint16_t version;
-    if (!VersionFromString(&version, args_map["-max-version"])) {
-      fprintf(stderr, "Unknown protocol version: '%s'\n",
-              args_map["-max-version"].c_str());
-      return false;
-    }
-    if (!SSL_CTX_set_max_proto_version(ctx.get(), version)) {
-      return false;
-    }
+  uint16_t max_version = TLS1_3_VERSION;
+  if (args_map.count("-max-version") != 0 &&
+      !VersionFromString(&max_version, args_map["-max-version"])) {
+    fprintf(stderr, "Unknown protocol version: '%s'\n",
+            args_map["-max-version"].c_str());
+    return false;
+  }
+
+  if (!SSL_CTX_set_max_proto_version(ctx.get(), max_version)) {
+    return false;
   }
 
   if (args_map.count("-min-version") != 0) {