commit 2214f4e4222bede8ff1164d68337744e4cefbaa0
author David Benjamin <davidben@google.com> Sat Dec 24 16:49:07 2016 -0500
committer Adam Langley <agl@google.com> Wed Jan 04 01:46:10 2017 +0000
tree 73081ab4c950df4657e8f5e280e2319cb20fdda2
parent 14e18ca257ea479097c72456a861c65e57cb7cd3

Remove call to SSL_CTX_set_tls_channel_id_enabled in bssl_shim.

Channel ID is already enabled on the SSL. This dates to
49c7af1c42b7206ab087e47704d36d435a7f319c which converted an instance of
tlsext_channel_id_enabled_new to it, but tlsext_channel_id_enabled_new
meant "if Channel ID is enabled, use the new one", not "enable Channel
ID".

Thanks to Eric Rescorla for catching this.

Change-Id: I2d5a82b930ffcbe5527a62a9aa5605ebb71a6b9f
Reviewed-on: https://boringssl-review.googlesource.com/13042
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>

ssl/test/bssl_shim.cc

diff --git a/ssl/test/bssl_shim.cc b/ssl/test/bssl_shim.cc
index 8fd6d31..418b9f0 100644
--- a/ssl/test/bssl_shim.cc
+++ b/ssl/test/bssl_shim.cc
@@ -983,7 +983,6 @@
     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);
 
   SSL_CTX_set_current_time_cb(ssl_ctx.get(), CurrentTimeCallback);