62fd16283a
State on s3 gets freed in both ssl3_clear and ssl3_free. Considate to just ssl3_free. This replaces the (SSL,ssl,ssl3)_clear calls in (SSL,ssl,ssl3)_new with the state that was initialized. This results in a little code duplication between SSL_new and SSL_clear because state is on the wrong object. I've just left TODOs for now; some of it will need disentangling. We're far from it, but going forward, separate state between s and s->s3 as: - s contains configuration state, DTLS or TLS. It is initialized from SSL_CTX, configurable directly afterwards, and preserved across SSL_clear calls. (Including when it's implicitly set as part of a handshake callback.) - Connection state hangs off s->s3 (TLS) and s->d1 (DTLS). It is reset across SSL_clear. This should happen naturally out of a ssl_free/ssl_new pair. The goal is to avoid needing separate initialize and reset code for anything; the point any particular state is reset is the point its owning context is destroyed and recreated. Change-Id: I5d779010778109f8c339c07433a0777feaf94d1f Reviewed-on: https://boringssl-review.googlesource.com/2822 Reviewed-by: Adam Langley <agl@google.com>
172 lines
5.2 KiB
C
172 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 "ssl_locl.h"
|
|
|
|
|
|
static const SSL_PROTOCOL_METHOD TLS_protocol_method = {
|
|
ssl3_new,
|
|
ssl3_free,
|
|
ssl3_accept,
|
|
ssl3_connect,
|
|
ssl3_read,
|
|
ssl3_peek,
|
|
ssl3_write,
|
|
ssl3_shutdown,
|
|
ssl3_renegotiate,
|
|
ssl3_renegotiate_check,
|
|
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,
|
|
ssl_undefined_void_function,
|
|
ssl3_callback_ctrl,
|
|
ssl3_ctx_callback_ctrl,
|
|
};
|
|
|
|
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();
|
|
}
|