TLS would not be entirely functional without extensions, so unifdef

OPENSSL_NO_TLSEXT.

ok tedu@

1 files changed, 0 insertions, 12 deletions

diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index 45968ce16a..d6f875a797 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -504,7 +504,6 @@ struct ssl_session_st {
         /* These are used to make removal of session-ids more
          * efficient and to implement a maximum cache size. */
         struct ssl_session_st *prev, *next;
-#ifndef OPENSSL_NO_TLSEXT
         char *tlsext_hostname;
 #ifndef OPENSSL_NO_EC
         size_t tlsext_ecpointformatlist_length;
@@ -516,7 +515,6 @@ struct ssl_session_st {
         unsigned char *tlsext_tick;     /* Session ticket */
         size_t tlsext_ticklen;          /* Session ticket length */
         long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */
-#endif
 };
 
 #endif
@@ -841,7 +839,6 @@ struct ssl_ctx_st {
         ENGINE *client_cert_engine;
 #endif
 
-#ifndef OPENSSL_NO_TLSEXT
         /* TLS extensions servername callback */
         int (*tlsext_servername_callback)(SSL*, int *, void *);
         void *tlsext_servername_arg;
@@ -862,7 +859,6 @@ struct ssl_ctx_st {
         int (*tlsext_opaque_prf_input_callback)(SSL *, void *peerinput,
             size_t len, void *arg);
         void *tlsext_opaque_prf_input_callback_arg;
-#endif
 
 #ifndef OPENSSL_NO_PSK
         char *psk_identity_hint;
@@ -874,7 +870,6 @@ struct ssl_ctx_st {
 #endif
 
 
-#ifndef OPENSSL_NO_TLSEXT
 
 # ifndef OPENSSL_NO_NEXTPROTONEG
         /* Next protocol negotiation information */
@@ -895,7 +890,6 @@ struct ssl_ctx_st {
         /* SRTP profiles we are willing to do from RFC 5764 */
         STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;
 
-#endif
 };
 
 #endif
@@ -1186,7 +1180,6 @@ struct ssl_st {
         int client_version;     /* what was passed, used for
                                  * SSLv3/TLS rollback check */
         unsigned int max_send_fragment;
-#ifndef OPENSSL_NO_TLSEXT
         /* TLS extension debug callback */
         void (*tlsext_debug_cb)(SSL *s, int client_server, int type,
             unsigned char *data, int len, void *arg);
@@ -1259,9 +1252,6 @@ struct ssl_st {
                                            */
         unsigned int tlsext_hb_pending; /* Indicates if a HeartbeatRequest is in flight */
         unsigned int tlsext_hb_seq;     /* HeartbeatRequest sequence number */
-#else
-#define session_ctx ctx
-#endif /* OPENSSL_NO_TLSEXT */
 
         int renegotiate;/* 1 if we are renegotiating.
                          * 2 if we are a server and are inside a handshake
@@ -1467,7 +1457,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_CTRL_SET_MAX_SEND_FRAGMENT          52
 
 /* see tls1.h for macros based on these */
-#ifndef OPENSSL_NO_TLSEXT
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB       53
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG      54
 #define SSL_CTRL_SET_TLSEXT_HOSTNAME            55
@@ -1498,7 +1487,6 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME               79
 #define SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH               80
 #define SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD               81
-#endif
 
 #define DTLS_CTRL_GET_TIMEOUT           73
 #define DTLS_CTRL_HANDLE_TIMEOUT        74