a41280d8cb
This uses ssl3_read_bytes for now. We still need to dismantle that function and then invert the handshake state machine, but this gets things closer to the right shape as an intermediate step and is a large chunk in itself. It simplifies a lot of the CCS/handshake synchronization as a lot of the invariants much more clearly follow from the handshake itself. Tests need to be adjusted since this changes some error codes. Now all the CCS/Handshake checks fall through to the usual SSL_R_UNEXPECTED_RECORD codepath. Most of what used to be a special-case falls out naturally. (If half of Finished was in the same record as the pre-CCS message, that part of the handshake record would have been left unconsumed, so read_change_cipher_spec would have noticed, just like read_app_data would have noticed.) Change-Id: I15c7501afe523d5062f0e24a3b65f053008d87be Reviewed-on: https://boringssl-review.googlesource.com/6642 Reviewed-by: Adam Langley <agl@google.com>
167 lines
5.1 KiB
C
167 lines
5.1 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 <openssl/ssl.h>
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
static const SSL_PROTOCOL_METHOD TLS_protocol_method = {
|
|
0 /* is_dtls */,
|
|
ssl3_new,
|
|
ssl3_free,
|
|
ssl3_accept,
|
|
ssl3_connect,
|
|
ssl3_get_message,
|
|
ssl3_read_app_data,
|
|
ssl3_read_change_cipher_spec,
|
|
ssl3_read_close_notify,
|
|
ssl3_write_app_data,
|
|
ssl3_dispatch_alert,
|
|
ssl3_supports_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();
|
|
}
|