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.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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

diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c
index 2584ceb88b..ddf847d390 100644
--- a/src/lib/libtls/tls.c
+++ b/src/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.42 2016/08/01 17:32:19 jsing Exp $ */
+/* $OpenBSD: tls.c,v 1.43 2016/08/02 07:47:11 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -310,14 +310,6 @@ tls_configure_ssl(struct tls *ctx)
 	if ((ctx->config->protocols & TLS_PROTOCOL_TLSv1_2) == 0)
 		SSL_CTX_set_options(ctx->ssl_ctx, SSL_OP_NO_TLSv1_2);
 
-	if (ctx->config->alpn != NULL) {
-		if (SSL_CTX_set_alpn_protos(ctx->ssl_ctx, ctx->config->alpn,
-		    ctx->config->alpn_len) != 0) {
-			tls_set_errorx(ctx, "failed to set alpn");
-			goto err;
-		}
-	}
-
 	if (ctx->config->ciphers != NULL) {
 		if (SSL_CTX_set_cipher_list(ctx->ssl_ctx,
 		    ctx->config->ciphers) != 1) {
-- 
cgit v1.2.3-55-g6feb