From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 28 Feb 2014 13:35:30 +0000 (+0000)
Subject: Fix compilation errors with no-nextprotoneg
X-Git-Tag: OpenSSL_1_0_2-beta2~298
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d1201e31958d974a61f0c614b79de17657689fc7;p=oweals%2Fopenssl.git

Fix compilation errors with no-nextprotoneg
---

diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index 9826e2f648..ef20aa6c73 100644
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -630,11 +630,11 @@ typedef struct ssl3_state_st
 #ifndef OPENSSL_NO_NEXTPROTONEG
 #define SSL3_ST_CW_NEXT_PROTO_A		(0x200|SSL_ST_CONNECT)
 #define SSL3_ST_CW_NEXT_PROTO_B		(0x201|SSL_ST_CONNECT)
+#endif
 #ifndef OPENSSL_NO_TLSEXT
 #define SSL3_ST_CW_SUPPLEMENTAL_DATA_A		(0x222|SSL_ST_CONNECT)
 #define SSL3_ST_CW_SUPPLEMENTAL_DATA_B		(0x223|SSL_ST_CONNECT)
 #endif
-#endif
 #define SSL3_ST_CW_FINISHED_A		(0x1B0|SSL_ST_CONNECT)
 #define SSL3_ST_CW_FINISHED_B		(0x1B1|SSL_ST_CONNECT)
 /* read from server */