Remove NPN support - the -nextprotoneg options now become no-ops.

ok bcook@ beck@ doug@

1 files changed, 1 insertions, 7 deletions

diff --git a/src/usr.bin/openssl/s_cb.c b/src/usr.bin/openssl/s_cb.c
index d8ab83fb01..73c4953c62 100644
--- a/src/usr.bin/openssl/s_cb.c
+++ b/src/usr.bin/openssl/s_cb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_cb.c,v 1.7 2016/12/30 17:25:48 jsing Exp $ */
+/* $OpenBSD: s_cb.c,v 1.8 2017/08/12 21:04:33 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -732,12 +732,6 @@ tlsext_cb(SSL * s, int client_server, int type, unsigned char *data, int len,
                 extname = "renegotiation info";
                 break;
 
-#ifdef TLSEXT_TYPE_next_proto_neg
-        case TLSEXT_TYPE_next_proto_neg:
-                extname = "next protocol";
-                break;
-#endif
-
         default:
                 extname = "unknown";
                 break;