Remove the ssl_prepare_{client,server}hello_tlsext() functions, which are

now nothing more than noops.

ok bcook@ doug@

1 files changed, 1 insertions, 6 deletions

diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 9962cabd73..3f9f6720fa 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.114 2015/08/29 16:51:17 doug Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.115 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1132,11 +1132,6 @@ ssl3_send_server_hello(SSL *s)
                 /* put the compression method */
                 *(p++) = 0;
 
-                if (ssl_prepare_serverhello_tlsext(s) <= 0) {
-                        SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,
-                            SSL_R_SERVERHELLO_TLSEXT);
-                        return (-1);
-                }
                 bufend = (unsigned char *)s->init_buf->data +
                     SSL3_RT_MAX_PLAIN_LENGTH;
                 if ((p = ssl_add_serverhello_tlsext(s, p, bufend)) == NULL) {