diff options
| author |   jsing <jsing@openbsd.org> | 2015-09-01 13:38:27 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-09-01 13:38:27 +0000 |
| commit | 3f38b3212cde555a84fd30e09163576e6a59932c (patch) | |
| tree | fcc8afce67847f69125511993112f74608329a43 /lib/libssl/src/ssl/s3_srvr.c | |
| parent | Make it always safe to call CBB_cleanup() providing that CBB_init() or (diff) | |
| download | wireguard-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/s3_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/s3_srvr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/libssl/src/ssl/s3_srvr.c b/lib/libssl/src/ssl/s3_srvr.c index 9962cabd733..3f9f6720fac 100644 --- a/lib/libssl/src/ssl/s3_srvr.c +++ b/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) { |