From 6946bfa953382f8050208e6198d3d6713b681d82 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 28 Aug 2017 17:36:58 +0000
Subject: Completely remove NPN remnants.

Based on a diff from doug@, similar diff from inoguchi@
---
 src/lib/libssl/ssl_lib.c | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

(limited to 'src/lib/libssl/ssl_lib.c')

diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 46d905ad56..b365ebd496 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.168 2017/08/13 17:04:36 doug Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.169 2017/08/28 17:36:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1590,30 +1590,6 @@ found:
 	return (status);
 }
 
-/* SSL_get0_next_proto_negotiated is deprecated. */
-void
-SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
-    unsigned *len)
-{
-	*data = NULL;
-	*len = 0;
-}
-
-/* SSL_CTX_set_next_protos_advertised_cb is deprecated. */
-void
-SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *ctx, int (*cb) (SSL *ssl,
-    const unsigned char **out, unsigned int *outlen, void *arg), void *arg)
-{
-}
-
-/* SSL_CTX_set_next_proto_select_cb is deprecated. */
-void
-SSL_CTX_set_next_proto_select_cb(SSL_CTX *ctx, int (*cb) (SSL *s,
-    unsigned char **out, unsigned char *outlen, const unsigned char *in,
-    unsigned int inlen, void *arg), void *arg)
-{
-}
-
 /*
  * SSL_CTX_set_alpn_protos sets the ALPN protocol list to the specified
  * protocols, which must be in wire-format (i.e. a series of non-empty,
-- 
cgit v1.2.3-55-g6feb