44d3eed2bb
The only case where renego is supported is if we are a client and the server sends a HelloRequest. That is still needed to support the renego + client auth hack in Chrome. Beyond that, no other forms of renego will work. The messy logic where the handshake loop is repurposed to send HelloRequest and the extremely confusing tri-state s->renegotiate (which makes SSL_renegotiate_pending a lie during the initial handshake as a server) are now gone. The next change will further simplify things by removing ssl->s3->renegotiate and the renego deferral logic. There's also some server-only renegotiation checks that can go now. Also clean up ssl3_read_bytes' HelloRequest handling. The old logic relied on the handshake state machine to reject bad HelloRequests which... actually that code probably lets you initiate renego by sending the first four bytes of a ServerHello and expecting the peer to read it later. BUG=429450 Change-Id: Ie0f87d0c2b94e13811fe8e22e810ab2ffc8efa6c Reviewed-on: https://boringssl-review.googlesource.com/4824 Reviewed-by: Adam Langley <agl@google.com>
171 lines
5.2 KiB
C
171 lines
5.2 KiB
C
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
|
* All rights reserved.
|
|
*
|
|
* This package is an SSL implementation written
|
|
* by Eric Young (eay@cryptsoft.com).
|
|
* The implementation was written so as to conform with Netscapes SSL.
|
|
*
|
|
* This library is free for commercial and non-commercial use as long as
|
|
* the following conditions are aheared to. The following conditions
|
|
* apply to all code found in this distribution, be it the RC4, RSA,
|
|
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
|
* included with this distribution is covered by the same copyright terms
|
|
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
|
*
|
|
* Copyright remains Eric Young's, and as such any Copyright notices in
|
|
* the code are not to be removed.
|
|
* If this package is used in a product, Eric Young should be given attribution
|
|
* as the author of the parts of the library used.
|
|
* This can be in the form of a textual message at program startup or
|
|
* in documentation (online or textual) provided with the package.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* "This product includes cryptographic software written by
|
|
* Eric Young (eay@cryptsoft.com)"
|
|
* The word 'cryptographic' can be left out if the rouines from the library
|
|
* being used are not cryptographic related :-).
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
|
* the apps directory (application code) you must include an acknowledgement:
|
|
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* The licence and distribution terms for any publically available version or
|
|
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
|
* copied and put under another distribution licence
|
|
* [including the GNU Public Licence.] */
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
static const SSL_PROTOCOL_METHOD TLS_protocol_method = {
|
|
0 /* is_dtls */,
|
|
ssl3_new,
|
|
ssl3_free,
|
|
ssl3_accept,
|
|
ssl3_connect,
|
|
ssl3_read,
|
|
ssl3_peek,
|
|
ssl3_write,
|
|
ssl3_shutdown,
|
|
ssl3_get_message,
|
|
ssl3_read_bytes,
|
|
ssl3_write_bytes,
|
|
ssl3_dispatch_alert,
|
|
ssl3_ctrl,
|
|
ssl3_ctx_ctrl,
|
|
ssl3_pending,
|
|
ssl3_num_ciphers,
|
|
ssl3_get_cipher,
|
|
SSL3_HM_HEADER_LENGTH,
|
|
ssl3_set_handshake_header,
|
|
ssl3_handshake_write,
|
|
};
|
|
|
|
const SSL_METHOD *TLS_method(void) {
|
|
static const SSL_METHOD method = {
|
|
0,
|
|
&TLS_protocol_method,
|
|
};
|
|
return &method;
|
|
}
|
|
|
|
const SSL_METHOD *SSLv23_method(void) {
|
|
return TLS_method();
|
|
}
|
|
|
|
/* Legacy version-locked methods. */
|
|
|
|
const SSL_METHOD *TLSv1_2_method(void) {
|
|
static const SSL_METHOD method = {
|
|
TLS1_2_VERSION,
|
|
&TLS_protocol_method,
|
|
};
|
|
return &method;
|
|
}
|
|
|
|
const SSL_METHOD *TLSv1_1_method(void) {
|
|
static const SSL_METHOD method = {
|
|
TLS1_1_VERSION,
|
|
&TLS_protocol_method,
|
|
};
|
|
return &method;
|
|
}
|
|
|
|
const SSL_METHOD *TLSv1_method(void) {
|
|
static const SSL_METHOD method = {
|
|
TLS1_VERSION,
|
|
&TLS_protocol_method,
|
|
};
|
|
return &method;
|
|
}
|
|
|
|
const SSL_METHOD *SSLv3_method(void) {
|
|
static const SSL_METHOD method = {
|
|
SSL3_VERSION,
|
|
&TLS_protocol_method,
|
|
};
|
|
return &method;
|
|
}
|
|
|
|
/* Legacy side-specific methods. */
|
|
|
|
const SSL_METHOD *TLSv1_2_server_method(void) {
|
|
return TLSv1_2_method();
|
|
}
|
|
|
|
const SSL_METHOD *TLSv1_1_server_method(void) {
|
|
return TLSv1_1_method();
|
|
}
|
|
|
|
const SSL_METHOD *TLSv1_server_method(void) {
|
|
return TLSv1_method();
|
|
}
|
|
|
|
const SSL_METHOD *SSLv3_server_method(void) {
|
|
return SSLv3_method();
|
|
}
|
|
|
|
const SSL_METHOD *TLSv1_2_client_method(void) {
|
|
return TLSv1_2_method();
|
|
}
|
|
|
|
const SSL_METHOD *TLSv1_1_client_method(void) {
|
|
return TLSv1_1_method();
|
|
}
|
|
|
|
const SSL_METHOD *TLSv1_client_method(void) {
|
|
return TLSv1_method();
|
|
}
|
|
|
|
const SSL_METHOD *SSLv3_client_method(void) {
|
|
return SSLv3_method();
|
|
}
|
|
|
|
const SSL_METHOD *SSLv23_server_method(void) {
|
|
return SSLv23_method();
|
|
}
|
|
|
|
const SSL_METHOD *SSLv23_client_method(void) {
|
|
return SSLv23_method();
|
|
}
|