summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/ssl/s23_clnt.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2015-09-01 13:38:27 +0000
committerjsing <jsing@openbsd.org>2015-09-01 13:38:27 +0000
commit3f38b3212cde555a84fd30e09163576e6a59932c (patch)
treefcc8afce67847f69125511993112f74608329a43 /lib/libssl/src/ssl/s23_clnt.c
parentMake it always safe to call CBB_cleanup() providing that CBB_init() or (diff)
downloadwireguard-openbsd-3f38b3212cde555a84fd30e09163576e6a59932c.tar.xz
wireguard-openbsd-3f38b3212cde555a84fd30e09163576e6a59932c.zip
Remove the ssl_prepare_{client,server}hello_tlsext() functions, which are
now nothing more than noops. ok bcook@ doug@
Diffstat (limited to 'lib/libssl/src/ssl/s23_clnt.c')
-rw-r--r--lib/libssl/src/ssl/s23_clnt.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/libssl/src/ssl/s23_clnt.c b/lib/libssl/src/ssl/s23_clnt.c
index aa668a3ccff..b6c058ece53 100644
--- a/lib/libssl/src/ssl/s23_clnt.c
+++ b/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);