From b303e332970ffd772a791a3a52b851697dd671bc Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 14 Dec 2014 14:34:43 +0000
Subject: unifdef OPENSSL_NO_NEXTPROTONEG, which is one of the last standing
 #ifndef mazes in libssl. NPN is being replaced by ALPN, however it is still
 going to be around for a while yet.

ok miod@
---
 src/lib/libssl/s3_lib.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 4beee2d53c..21e339525c 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.87 2014/12/10 15:36:47 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.88 2014/12/14 14:34:43 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1927,11 +1927,9 @@ ssl3_clear(SSL *s)
 	s->s3->in_read_app_data = 0;
 	s->version = SSL3_VERSION;
 
-#ifndef OPENSSL_NO_NEXTPROTONEG
 	free(s->next_proto_negotiated);
 	s->next_proto_negotiated = NULL;
 	s->next_proto_negotiated_len = 0;
-#endif
 }
 
 
-- 
cgit v1.2.3-55-g6feb