From cce7b68820089fd3e362dbb39f91e53db9de4978 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 2 Aug 2016 07:47:11 +0000
Subject: Revert previous since it adds new symbols.

Requested by deraadt@
---
 src/lib/libtls/tls_server.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'src/lib/libtls/tls_server.c')

diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c
index f13c9db083..bba15aae7e 100644
--- a/src/lib/libtls/tls_server.c
+++ b/src/lib/libtls/tls_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_server.c,v 1.20 2016/08/01 17:32:19 jsing Exp $ */
+/* $OpenBSD: tls_server.c,v 1.21 2016/08/02 07:47:11 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -48,20 +48,6 @@ tls_server_conn(struct tls *ctx)
 	return (conn_ctx);
 }
 
-static int
-tls_server_alpn_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen,
-    const unsigned char *in, unsigned int inlen, void *arg)
-{
-	struct tls *ctx = arg;
-
-	if (SSL_select_next_proto((unsigned char**)out, outlen,
-	    ctx->config->alpn, ctx->config->alpn_len, in, inlen) ==
-	    OPENSSL_NPN_NEGOTIATED)
-		return (SSL_TLSEXT_ERR_OK);
-
-	return (SSL_TLSEXT_ERR_NOACK);
-}
-
 int
 tls_configure_server(struct tls *ctx)
 {
@@ -85,10 +71,6 @@ tls_configure_server(struct tls *ctx)
 			goto err;
 	}
 
-	if (ctx->config->alpn != NULL)
-		SSL_CTX_set_alpn_select_cb(ctx->ssl_ctx, tls_server_alpn_cb,
-		    ctx);
-
 	if (ctx->config->dheparams == -1)
 		SSL_CTX_set_dh_auto(ctx->ssl_ctx, 1);
 	else if (ctx->config->dheparams == 1024)
-- 
cgit v1.2.3-55-g6feb