TLS would not be entirely functional without extensions, so unifdef

OPENSSL_NO_TLSEXT.

ok tedu@

1 files changed, 0 insertions, 27 deletions

diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 120f92a9d3..4a6c3cb1e8 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -357,17 +357,12 @@ ssl3_accept(SSL *s)
                         ret = ssl3_send_server_hello(s);
                         if (ret <= 0)
                                 goto end;
-#ifndef OPENSSL_NO_TLSEXT
                         if (s->hit) {
                                 if (s->tlsext_ticket_expected)
                                         s->state = SSL3_ST_SW_SESSION_TICKET_A;
                                 else
                                         s->state = SSL3_ST_SW_CHANGE_A;
                         }
-#else
-                        if (s->hit)
-                                s->state = SSL3_ST_SW_CHANGE_A;
-#endif
                         else
                                 s->state = SSL3_ST_SW_CERT_A;
                         s->init_num = 0;
@@ -385,7 +380,6 @@ ssl3_accept(SSL *s)
                                 ret = ssl3_send_server_certificate(s);
                                 if (ret <= 0)
                                         goto end;
-#ifndef OPENSSL_NO_TLSEXT
                                 if (s->tlsext_status_expected)
                                         s->state = SSL3_ST_SW_CERT_STATUS_A;
                                 else
@@ -394,12 +388,6 @@ ssl3_accept(SSL *s)
                                 skip = 1;
                                 s->state = SSL3_ST_SW_KEY_EXCH_A;
                         }
-#else
-                        } else
-                                skip = 1;
-
-                        s->state = SSL3_ST_SW_KEY_EXCH_A;
-#endif
                         s->init_num = 0;
                         break;
 
@@ -683,16 +671,13 @@ ssl3_accept(SSL *s)
                                 goto end;
                         if (s->hit)
                                 s->state = SSL_ST_OK;
-#ifndef OPENSSL_NO_TLSEXT
                         else if (s->tlsext_ticket_expected)
                                 s->state = SSL3_ST_SW_SESSION_TICKET_A;
-#endif
                         else
                                 s->state = SSL3_ST_SW_CHANGE_A;
                         s->init_num = 0;
                         break;
 
-#ifndef OPENSSL_NO_TLSEXT
                 case SSL3_ST_SW_SESSION_TICKET_A:
                 case SSL3_ST_SW_SESSION_TICKET_B:
                         ret = ssl3_send_newsession_ticket(s);
@@ -711,7 +696,6 @@ ssl3_accept(SSL *s)
                         s->init_num = 0;
                         break;
 
-#endif
 
                 case SSL3_ST_SW_CHANGE_A:
                 case SSL3_ST_SW_CHANGE_B:
@@ -1123,7 +1107,6 @@ ssl3_get_client_hello(SSL *s)
                 goto f_err;
         }
 
-#ifndef OPENSSL_NO_TLSEXT
         /* TLS extensions*/
         if (s->version >= SSL3_VERSION) {
                 if (!ssl_parse_clienthello_tlsext(s, &p, d, n, &al)) {
@@ -1191,7 +1174,6 @@ ssl3_get_client_hello(SSL *s)
                             sk_SSL_CIPHER_dup(s->session->ciphers);
                 }
         }
-#endif
 
         /*
          * Worst case, we will use the NULL compression, but if we have other
@@ -1381,11 +1363,6 @@ ssl3_send_server_hello(SSL *s)
 
         if (s->state == SSL3_ST_SW_SRVR_HELLO_A) {
                 buf = (unsigned char *)s->init_buf->data;
-#ifdef OPENSSL_NO_TLSEXT
-                p = s->s3->server_random;
-                if (ssl_fill_hello_random(s, 1, p, SSL3_RANDOM_SIZE) <= 0)
-                        return (-1);
-#endif
                 /* Do the message type and length last */
                 d = p= &(buf[4]);
 
@@ -1441,7 +1418,6 @@ ssl3_send_server_hello(SSL *s)
                 else
                         *(p++) = s->s3->tmp.new_compression->id;
 #endif
-#ifndef OPENSSL_NO_TLSEXT
                 if (ssl_prepare_serverhello_tlsext(s) <= 0) {
                         SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,
                             SSL_R_SERVERHELLO_TLSEXT);
@@ -1453,7 +1429,6 @@ ssl3_send_server_hello(SSL *s)
                             ERR_R_INTERNAL_ERROR);
                         return (-1);
                 }
-#endif
                 /* do the header */
                 l = (p - d);
                 d = buf;
@@ -2928,7 +2903,6 @@ ssl3_send_server_certificate(SSL *s)
         return (ssl3_do_write(s, SSL3_RT_HANDSHAKE));
 }
 
-#ifndef OPENSSL_NO_TLSEXT
 /* send a new session ticket (not necessarily for a new session) */
 int
 ssl3_send_newsession_ticket(SSL *s)
@@ -3180,4 +3154,3 @@ ssl3_get_next_proto(SSL *s)
         return (1);
 }
 # endif
-#endif