gistfile1.txt

Author: EKR <ekr@rtfm.com>
Date:   Fri Dec 23 15:08:13 2016 -0800

    Fix issue with channel_id
Change-Id: I9df8c31e33adaebf2b2a072010aeab49755b653b

diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
index 7af8549..a37d4a7 100644
--- a/ssl/test/bssl_shim.cc
+++ b/ssl/test/bssl_shim.cc
@@ -984,8 +984,10 @@ static bssl::UniquePtr<SSL_CTX> SetupCtx(const TestConfig *config) {
     SSL_CTX_set_alpn_select_cb(ssl_ctx.get(), AlpnSelectCallback, NULL);
   }

-  SSL_CTX_set_tls_channel_id_enabled(ssl_ctx.get(), 1);
-  SSL_CTX_set_channel_id_cb(ssl_ctx.get(), ChannelIdCallback);
+  if (config->enable_channel_id) {
+    SSL_CTX_set_tls_channel_id_enabled(ssl_ctx.get(), 1);
+    SSL_CTX_set_channel_id_cb(ssl_ctx.get(), ChannelIdCallback);
+  }

   SSL_CTX_set_current_time_cb(ssl_ctx.get(), CurrentTimeCallback);