From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 15 Apr 2011 22:39:15 +0000 (+0200)
Subject: Session tickets are included unconditionally.
X-Git-Tag: gnutls_2_99_1~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa5cfc8beb6a6fe9fffb06baaf92ae9d900c6105;p=thirdparty%2Fgnutls.git

Session tickets are included unconditionally.
---

diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index b0cd9e4b26..0ea30b1425 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -330,11 +330,9 @@ _gnutls_ext_init (void)
     return ret;
 #endif
 
-#ifdef ENABLE_SESSION_TICKET
   ret = _gnutls_ext_register (&ext_mod_session_ticket);
   if (ret != GNUTLS_E_SUCCESS)
     return ret;
-#endif
 
   ret = _gnutls_ext_register (&ext_mod_sig);
   if (ret != GNUTLS_E_SUCCESS)
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 68c15288d0..a7f6fc610b 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -3046,7 +3046,6 @@ _gnutls_handshake_common (gnutls_session_t session)
       ret = _gnutls_recv_handshake_final (session, TRUE);
       IMED_RET ("recv handshake final", ret, 1);
 
-#ifdef ENABLE_SESSION_TICKET
       switch (STATE)
         {
         case STATE0:
@@ -3058,7 +3057,6 @@ _gnutls_handshake_common (gnutls_session_t session)
         default:
           break;
         }
-#endif
 
       ret = _gnutls_send_handshake_final (session, FALSE);
       IMED_RET ("send handshake final", ret, 1);
@@ -3076,7 +3074,6 @@ _gnutls_handshake_common (gnutls_session_t session)
       ret = _gnutls_send_handshake_final (session, TRUE);
       IMED_RET ("send handshake final 2", ret, 1);
 
-#ifdef ENABLE_SESSION_TICKET
       switch (STATE)
         {
         case STATE0:
@@ -3088,7 +3085,6 @@ _gnutls_handshake_common (gnutls_session_t session)
         default:
           break;
         }
-#endif
 
       ret = _gnutls_recv_handshake_final (session, FALSE);
       IMED_RET ("recv handshake final 2", ret, 1);