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

now nothing more than noops.

ok bcook@ doug@

10 files changed, 10 insertions, 68 deletions

diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c
index aa668a3ccf..b6c058ece5 100644
--- a/src/lib/libssl/s23_clnt.c
+++ b/src/lib/libssl/s23_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_clnt.c,v 1.42 2015/08/29 17:15:52 doug Exp $ */
+/* $OpenBSD: s23_clnt.c,v 1.43 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -359,11 +359,6 @@ ssl23_client_hello(SSL *s)
                 *(p++) = 0;
 
                 /* TLS extensions*/
-                if (ssl_prepare_clienthello_tlsext(s) <= 0) {
-                        SSLerr(SSL_F_SSL23_CLIENT_HELLO,
-                            SSL_R_CLIENTHELLO_TLSEXT);
-                        return -1;
-                }
                 if ((p = ssl_add_clienthello_tlsext(s, p,
                     buf + SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) {
                         SSLerr(SSL_F_SSL23_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 5503f89ab6..5b9af06aa5 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.123 2015/08/29 16:51:17 doug Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.124 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -675,11 +675,6 @@ ssl3_client_hello(SSL *s)
                 *(p++) = 0; /* Add the NULL method */
 
                 /* TLS extensions*/
-                if (ssl_prepare_clienthello_tlsext(s) <= 0) {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,
-                            SSL_R_CLIENTHELLO_TLSEXT);
-                        goto err;
-                }
                 bufend = (unsigned char *)s->init_buf->data +
                     SSL3_RT_MAX_PLAIN_LENGTH;
                 if ((p = ssl_add_clienthello_tlsext(s, p, bufend)) == NULL) {
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) {
diff --git a/src/lib/libssl/src/ssl/s23_clnt.c b/src/lib/libssl/src/ssl/s23_clnt.c
index aa668a3ccf..b6c058ece5 100644
--- a/src/lib/libssl/src/ssl/s23_clnt.c
+++ b/src/lib/libssl/src/ssl/s23_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s23_clnt.c,v 1.42 2015/08/29 17:15:52 doug Exp $ */
+/* $OpenBSD: s23_clnt.c,v 1.43 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -359,11 +359,6 @@ ssl23_client_hello(SSL *s)
                 *(p++) = 0;
 
                 /* TLS extensions*/
-                if (ssl_prepare_clienthello_tlsext(s) <= 0) {
-                        SSLerr(SSL_F_SSL23_CLIENT_HELLO,
-                            SSL_R_CLIENTHELLO_TLSEXT);
-                        return -1;
-                }
                 if ((p = ssl_add_clienthello_tlsext(s, p,
                     buf + SSL3_RT_MAX_PLAIN_LENGTH)) == NULL) {
                         SSLerr(SSL_F_SSL23_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index 5503f89ab6..5b9af06aa5 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_clnt.c,v 1.123 2015/08/29 16:51:17 doug Exp $ */
+/* $OpenBSD: s3_clnt.c,v 1.124 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -675,11 +675,6 @@ ssl3_client_hello(SSL *s)
                 *(p++) = 0; /* Add the NULL method */
 
                 /* TLS extensions*/
-                if (ssl_prepare_clienthello_tlsext(s) <= 0) {
-                        SSLerr(SSL_F_SSL3_CLIENT_HELLO,
-                            SSL_R_CLIENTHELLO_TLSEXT);
-                        goto err;
-                }
                 bufend = (unsigned char *)s->init_buf->data +
                     SSL3_RT_MAX_PLAIN_LENGTH;
                 if ((p = ssl_add_clienthello_tlsext(s, p, bufend)) == NULL) {
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index 9962cabd73..3f9f6720fa 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/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) {
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 098065f3bc..b7853b24c8 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.101 2015/08/29 17:15:52 doug Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.102 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -816,8 +816,6 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data,
     unsigned char *d, int n, int *al);
 int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data,
     unsigned char *d, int n, int *al);
-int ssl_prepare_clienthello_tlsext(SSL *s);
-int ssl_prepare_serverhello_tlsext(SSL *s);
 int ssl_check_clienthello_tlsext_early(SSL *s);
 int ssl_check_clienthello_tlsext_late(SSL *s);
 int ssl_check_serverhello_tlsext(SSL *s);
diff --git a/src/lib/libssl/src/ssl/t1_lib.c b/src/lib/libssl/src/ssl/t1_lib.c
index b892fa9b91..fc54fe1e6d 100644
--- a/src/lib/libssl/src/ssl/t1_lib.c
+++ b/src/lib/libssl/src/ssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.83 2015/08/19 23:34:34 bcook Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.84 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1830,18 +1830,6 @@ ri_check:
 }
 
 int
-ssl_prepare_clienthello_tlsext(SSL *s)
-{
-        return 1;
-}
-
-int
-ssl_prepare_serverhello_tlsext(SSL *s)
-{
-        return 1;
-}
-
-int
 ssl_check_clienthello_tlsext_early(SSL *s)
 {
         int ret = SSL_TLSEXT_ERR_NOACK;
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 098065f3bc..b7853b24c8 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.101 2015/08/29 17:15:52 doug Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.102 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -816,8 +816,6 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data,
     unsigned char *d, int n, int *al);
 int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data,
     unsigned char *d, int n, int *al);
-int ssl_prepare_clienthello_tlsext(SSL *s);
-int ssl_prepare_serverhello_tlsext(SSL *s);
 int ssl_check_clienthello_tlsext_early(SSL *s);
 int ssl_check_clienthello_tlsext_late(SSL *s);
 int ssl_check_serverhello_tlsext(SSL *s);
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index b892fa9b91..fc54fe1e6d 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.83 2015/08/19 23:34:34 bcook Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.84 2015/09/01 13:38:27 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1830,18 +1830,6 @@ ri_check:
 }
 
 int
-ssl_prepare_clienthello_tlsext(SSL *s)
-{
-        return 1;
-}
-
-int
-ssl_prepare_serverhello_tlsext(SSL *s)
-{
-        return 1;
-}
-
-int
 ssl_check_clienthello_tlsext_early(SSL *s)
 {
         int ret = SSL_TLSEXT_ERR_NOACK;