commit 9d125dcdec52e8968c377c51cfbb4f2d4ad4af7b
author David Benjamin <davidben@google.com> Wed Dec 07 21:32:37 2016 -0500
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Thu Dec 08 16:05:02 2016 +0000
tree 0abcf65d6a34163cd7bfdf0907d65c6ca1d36a0d
parent 82bbe5503d253bf962de8b49de8909733fda4536

Remove SSL_OP_DISABLE_NPN.

This was useful when we were transitioning NPN off in Chromium, but now
there are no callers remaining.

Change-Id: Ic619613d6d475eea6bc258c4a90148f129ea4a81
Reviewed-on: https://boringssl-review.googlesource.com/12637
Reviewed-by: Steven Valdez <svaldez@google.com>
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>

ssl/t1_lib.c

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 0f20314..fa1c067 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1233,7 +1233,7 @@
   SSL *const ssl = hs->ssl;
   if (ssl->s3->initial_handshake_complete ||
       ssl->ctx->next_proto_select_cb == NULL ||
-      (ssl->options & SSL_OP_DISABLE_NPN) || SSL_is_dtls(ssl)) {
+      SSL_is_dtls(ssl)) {
     return 1;
   }
 
@@ -1262,7 +1262,6 @@
   assert(!ssl->s3->initial_handshake_complete);
   assert(!SSL_is_dtls(ssl));
   assert(ssl->ctx->next_proto_select_cb != NULL);
-  assert(!(ssl->options & SSL_OP_DISABLE_NPN));
 
   if (ssl->s3->alpn_selected != NULL) {
     /* NPN and ALPN may not be negotiated in the same connection. */