From: Ben Laurie <ben@links.org>
Date: Mon, 18 Apr 2016 09:45:02 +0000 (+0100)
Subject: Fix enable-ssl-trace no-nextprotoneg.
X-Git-Tag: OpenSSL_1_1_0-pre6~1046
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d94ce4100fb39dc12ceec38b1d14267a4c7e64b3;p=oweals%2Fopenssl.git

Fix enable-ssl-trace no-nextprotoneg.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index cb22d49c82..b56b50422a 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -497,7 +497,9 @@ static ssl_trace_tbl ssl_exts_tbl[] = {
     {TLSEXT_TYPE_heartbeat, "heartbeat"},
     {TLSEXT_TYPE_session_ticket, "session_ticket"},
     {TLSEXT_TYPE_renegotiate, "renegotiate"},
+#ifndef OPENSSL_NO_NEXTPROTONEG
     {TLSEXT_TYPE_next_proto_neg, "next_proto_neg"},
+#endif
     {TLSEXT_TYPE_signed_certificate_timestamp, "signed_certificate_timestamps"},
     {TLSEXT_TYPE_padding, "padding"},
     {TLSEXT_TYPE_encrypt_then_mac, "encrypt_then_mac"},