2016-09-24 17:50:27 +00:00
|
|
|
From f15a7e39a1f7d41716ca5f07faef74f55147d2cf Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Dirk Feytons <dirk.feytons@gmail.com>
|
|
|
|
|
Date: Thu, 22 Sep 2016 16:17:45 +0200
|
|
|
|
|
Subject: [PATCH] Fix build with no-nextprotoneg
|
|
|
|
|
|
|
|
|
|
Add a missing ifdef. Same change is already present in master.
|
|
|
|
|
|
|
|
|
|
Reviewed-by: Matt Caswell <matt@openssl.org>
|
|
|
|
|
Reviewed-by: Rich Salz <rsalz@openssl.org>
|
|
|
|
|
(Merged from https://github.com/openssl/openssl/pull/1100)
|
|
|
|
|
---
|
|
|
|
|
ssl/t1_ext.c | 2 ++
|
|
|
|
|
1 file changed, 2 insertions(+)
|
|
|
|
|
|
2016-05-20 11:39:12 +00:00
|
|
|
--- a/ssl/t1_ext.c
|
|
|
|
|
+++ b/ssl/t1_ext.c
|
|
|
|
|
@@ -275,7 +275,9 @@ int SSL_extension_supported(unsigned int
|
|
|
|
|
case TLSEXT_TYPE_ec_point_formats:
|
|
|
|
|
case TLSEXT_TYPE_elliptic_curves:
|
|
|
|
|
case TLSEXT_TYPE_heartbeat:
|
|
|
|
|
+# ifndef OPENSSL_NO_NEXTPROTONEG
|
|
|
|
|
case TLSEXT_TYPE_next_proto_neg:
|
|
|
|
|
+# endif
|
|
|
|
|
case TLSEXT_TYPE_padding:
|
|
|
|
|
case TLSEXT_TYPE_renegotiate:
|
|
|
|
|
case TLSEXT_TYPE_server_name:
|
