2014-06-20 20:00:00 +01:00
|
|
|
/* 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.]
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
|
|
|
|
*
|
|
|
|
* 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 above 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 acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
|
|
|
*
|
|
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
|
|
* endorse or promote products derived from this software without
|
|
|
|
* prior written permission. For written permission, please contact
|
|
|
|
* openssl-core@openssl.org.
|
|
|
|
*
|
|
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
|
|
* permission of the OpenSSL Project.
|
|
|
|
*
|
|
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
|
|
* acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
|
|
* EXPRESSED 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 OpenSSL PROJECT OR
|
|
|
|
* ITS 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.
|
|
|
|
* ====================================================================
|
|
|
|
*
|
|
|
|
* This product includes cryptographic software written by Eric Young
|
|
|
|
* (eay@cryptsoft.com). This product includes software written by Tim
|
|
|
|
* Hudson (tjh@cryptsoft.com).
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright 2005 Nokia. All rights reserved.
|
|
|
|
*
|
|
|
|
* The portions of the attached software ("Contribution") is developed by
|
|
|
|
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
|
|
|
|
* license.
|
|
|
|
*
|
|
|
|
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
|
|
|
|
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
|
|
|
|
* support (see RFC 4279) to OpenSSL.
|
|
|
|
*
|
|
|
|
* No patent licenses or other rights except those expressly stated in
|
|
|
|
* the OpenSSL open source license shall be deemed granted or received
|
|
|
|
* expressly, by implication, estoppel, or otherwise.
|
|
|
|
*
|
|
|
|
* No assurances are provided by Nokia that the Contribution does not
|
|
|
|
* infringe the patent or other intellectual property rights of any third
|
|
|
|
* party or that the license provides you with all the necessary rights
|
|
|
|
* to make use of the Contribution.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
|
|
|
|
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
|
|
|
|
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
|
|
|
|
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
|
|
|
|
* OTHERWISE. */
|
|
|
|
|
2015-09-15 06:48:04 +01:00
|
|
|
#include <openssl/ssl.h>
|
|
|
|
|
2015-06-16 20:34:50 +01:00
|
|
|
#include <assert.h>
|
2016-09-01 06:10:07 +01:00
|
|
|
#include <stdlib.h>
|
2015-04-08 04:05:04 +01:00
|
|
|
#include <string.h>
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2017-07-20 19:49:15 +01:00
|
|
|
#include <utility>
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/lhash.h>
|
|
|
|
#include <openssl/mem.h>
|
|
|
|
#include <openssl/rand.h>
|
|
|
|
|
2015-04-08 03:38:30 +01:00
|
|
|
#include "internal.h"
|
2015-04-15 21:46:09 +01:00
|
|
|
#include "../crypto/internal.h"
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
namespace bssl {
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
/* The address of this is a magic value, a pointer to which is returned by
|
|
|
|
* SSL_magic_pending_session_ptr(). It allows a session callback to indicate
|
|
|
|
* that it needs to asynchronously fetch session information. */
|
2015-01-29 00:20:02 +00:00
|
|
|
static const char g_pending_session_magic = 0;
|
2014-06-20 20:00:00 +01:00
|
|
|
|
Reserve ex_data index zero for app_data.
In the ancient times, before ex_data and OpenSSL, SSLeay supported a
single app_data slot in various types. Later app_data begat ex_data, and
app_data was replaced by compatibility macros to ex_data index zero.
Today, app_data is still in use, but ex_data never reserved index zero
for app_data. This causes some danger where, if the first ex_data
registration did not use NULL callbacks, the registration's callbacks
would collide with app_data.
Instead, add an option to the types with app_data to reserve index zero.
Also switch SSL_get_ex_data_X509_STORE_CTX_idx to always return zero
rather than allocate a new one. It used to be that you used
X509_STORE_CTX_get_app_data. I only found one consumer that we probably
don't care about, but, to be safe and since it's easy, go with the
conservative option. (Although SSL_get_ex_data_X509_STORE_CTX_idx wasn't
guaranteed to alias app_data, in practice it always did. No consumer
ever calls X509_STORE_CTX_get_ex_new_index.)
Change-Id: Ie75b279d60aefd003ffef103f99021c5d696a5e9
Reviewed-on: https://boringssl-review.googlesource.com/5313
Reviewed-by: Adam Langley <agl@google.com>
2015-06-30 04:36:17 +01:00
|
|
|
static CRYPTO_EX_DATA_CLASS g_ex_data_class =
|
|
|
|
CRYPTO_EX_DATA_CLASS_INIT_WITH_APP_DATA;
|
2015-04-15 22:29:53 +01:00
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *session);
|
|
|
|
static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *session);
|
|
|
|
static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *session, int lock);
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2017-07-20 19:49:15 +01:00
|
|
|
UniquePtr<SSL_SESSION> ssl_session_new(const SSL_X509_METHOD *x509_method) {
|
|
|
|
UniquePtr<SSL_SESSION> session(
|
|
|
|
(SSL_SESSION *)OPENSSL_malloc(sizeof(SSL_SESSION)));
|
|
|
|
if (!session) {
|
2015-09-13 19:46:26 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
|
|
|
|
return 0;
|
|
|
|
}
|
2017-07-20 19:49:15 +01:00
|
|
|
OPENSSL_memset(session.get(), 0, sizeof(SSL_SESSION));
|
2015-09-13 19:46:26 +01:00
|
|
|
|
2017-02-01 23:49:37 +00:00
|
|
|
session->x509_method = x509_method;
|
2016-07-18 18:17:16 +01:00
|
|
|
session->verify_result = X509_V_ERR_INVALID_CALL;
|
2015-09-13 19:46:26 +01:00
|
|
|
session->references = 1;
|
|
|
|
session->timeout = SSL_DEFAULT_SESSION_TIMEOUT;
|
2017-01-28 19:00:32 +00:00
|
|
|
session->auth_timeout = SSL_DEFAULT_SESSION_TIMEOUT;
|
2017-02-20 22:00:20 +00:00
|
|
|
session->time = time(NULL);
|
2015-12-05 04:14:35 +00:00
|
|
|
CRYPTO_new_ex_data(&session->ex_data);
|
2015-09-13 19:46:26 +01:00
|
|
|
return session;
|
|
|
|
}
|
|
|
|
|
2017-07-20 19:49:15 +01:00
|
|
|
UniquePtr<SSL_SESSION> SSL_SESSION_dup(SSL_SESSION *session, int dup_flags) {
|
|
|
|
UniquePtr<SSL_SESSION> new_session = ssl_session_new(session->x509_method);
|
|
|
|
if (!new_session) {
|
|
|
|
return nullptr;
|
2016-06-27 21:34:59 +01:00
|
|
|
}
|
|
|
|
|
2016-12-12 18:51:00 +00:00
|
|
|
new_session->is_server = session->is_server;
|
2016-06-27 21:34:59 +01:00
|
|
|
new_session->ssl_version = session->ssl_version;
|
2016-07-29 19:32:55 +01:00
|
|
|
new_session->sid_ctx_length = session->sid_ctx_length;
|
2016-12-13 06:07:13 +00:00
|
|
|
OPENSSL_memcpy(new_session->sid_ctx, session->sid_ctx, session->sid_ctx_length);
|
2016-07-29 19:32:55 +01:00
|
|
|
|
|
|
|
/* Copy the key material. */
|
2016-06-27 21:34:59 +01:00
|
|
|
new_session->master_key_length = session->master_key_length;
|
2016-12-13 06:07:13 +00:00
|
|
|
OPENSSL_memcpy(new_session->master_key, session->master_key,
|
2016-06-27 21:34:59 +01:00
|
|
|
session->master_key_length);
|
2016-07-29 19:32:55 +01:00
|
|
|
new_session->cipher = session->cipher;
|
|
|
|
|
|
|
|
/* Copy authentication state. */
|
2016-06-27 21:34:59 +01:00
|
|
|
if (session->psk_identity != NULL) {
|
|
|
|
new_session->psk_identity = BUF_strdup(session->psk_identity);
|
|
|
|
if (new_session->psk_identity == NULL) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return nullptr;
|
2016-06-27 21:34:59 +01:00
|
|
|
}
|
|
|
|
}
|
2016-12-12 19:06:16 +00:00
|
|
|
if (session->certs != NULL) {
|
|
|
|
new_session->certs = sk_CRYPTO_BUFFER_new_null();
|
|
|
|
if (new_session->certs == NULL) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return nullptr;
|
2016-12-12 19:06:16 +00:00
|
|
|
}
|
|
|
|
for (size_t i = 0; i < sk_CRYPTO_BUFFER_num(session->certs); i++) {
|
|
|
|
CRYPTO_BUFFER *buffer = sk_CRYPTO_BUFFER_value(session->certs, i);
|
|
|
|
if (!sk_CRYPTO_BUFFER_push(new_session->certs, buffer)) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return nullptr;
|
2016-12-12 19:06:16 +00:00
|
|
|
}
|
|
|
|
CRYPTO_BUFFER_up_ref(buffer);
|
|
|
|
}
|
|
|
|
}
|
2017-02-01 23:49:37 +00:00
|
|
|
|
2017-07-20 19:49:15 +01:00
|
|
|
if (!session->x509_method->session_dup(new_session.get(), session)) {
|
|
|
|
return nullptr;
|
2016-06-27 21:34:59 +01:00
|
|
|
}
|
2017-02-01 23:49:37 +00:00
|
|
|
|
2016-06-27 21:34:59 +01:00
|
|
|
new_session->verify_result = session->verify_result;
|
2016-07-29 19:32:55 +01:00
|
|
|
|
|
|
|
if (session->ocsp_response != NULL) {
|
2017-08-22 23:07:51 +01:00
|
|
|
new_session->ocsp_response = session->ocsp_response;
|
|
|
|
CRYPTO_BUFFER_up_ref(new_session->ocsp_response);
|
2016-06-27 21:34:59 +01:00
|
|
|
}
|
|
|
|
|
2017-08-22 23:07:51 +01:00
|
|
|
if (session->signed_cert_timestamp_list != NULL) {
|
|
|
|
new_session->signed_cert_timestamp_list =
|
|
|
|
session->signed_cert_timestamp_list;
|
|
|
|
CRYPTO_BUFFER_up_ref(new_session->signed_cert_timestamp_list);
|
2016-06-27 21:34:59 +01:00
|
|
|
}
|
2016-07-29 19:32:55 +01:00
|
|
|
|
2016-12-13 06:07:13 +00:00
|
|
|
OPENSSL_memcpy(new_session->peer_sha256, session->peer_sha256,
|
|
|
|
SHA256_DIGEST_LENGTH);
|
2016-06-27 21:34:59 +01:00
|
|
|
new_session->peer_sha256_valid = session->peer_sha256_valid;
|
2016-07-29 19:32:55 +01:00
|
|
|
|
2016-11-16 08:08:23 +00:00
|
|
|
if (session->tlsext_hostname != NULL) {
|
|
|
|
new_session->tlsext_hostname = BUF_strdup(session->tlsext_hostname);
|
|
|
|
if (new_session->tlsext_hostname == NULL) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return nullptr;
|
2016-11-16 08:08:23 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-14 01:05:36 +00:00
|
|
|
new_session->peer_signature_algorithm = session->peer_signature_algorithm;
|
|
|
|
|
2016-09-22 05:11:43 +01:00
|
|
|
new_session->timeout = session->timeout;
|
2017-01-28 19:00:32 +00:00
|
|
|
new_session->auth_timeout = session->auth_timeout;
|
2016-09-22 05:11:43 +01:00
|
|
|
new_session->time = session->time;
|
|
|
|
|
2016-07-29 19:32:55 +01:00
|
|
|
/* Copy non-authentication connection properties. */
|
|
|
|
if (dup_flags & SSL_SESSION_INCLUDE_NONAUTH) {
|
|
|
|
new_session->session_id_length = session->session_id_length;
|
2016-12-13 06:07:13 +00:00
|
|
|
OPENSSL_memcpy(new_session->session_id, session->session_id,
|
|
|
|
session->session_id_length);
|
2016-07-29 19:32:55 +01:00
|
|
|
|
2016-12-11 07:48:12 +00:00
|
|
|
new_session->group_id = session->group_id;
|
2016-07-29 19:32:55 +01:00
|
|
|
|
2016-12-13 06:07:13 +00:00
|
|
|
OPENSSL_memcpy(new_session->original_handshake_hash,
|
|
|
|
session->original_handshake_hash,
|
|
|
|
session->original_handshake_hash_len);
|
2016-07-29 19:32:55 +01:00
|
|
|
new_session->original_handshake_hash_len =
|
|
|
|
session->original_handshake_hash_len;
|
|
|
|
new_session->tlsext_tick_lifetime_hint = session->tlsext_tick_lifetime_hint;
|
|
|
|
new_session->ticket_age_add = session->ticket_age_add;
|
2016-12-07 20:29:45 +00:00
|
|
|
new_session->ticket_max_early_data = session->ticket_max_early_data;
|
2016-07-29 19:32:55 +01:00
|
|
|
new_session->extended_master_secret = session->extended_master_secret;
|
2017-02-14 18:20:40 +00:00
|
|
|
|
|
|
|
if (session->early_alpn != NULL) {
|
|
|
|
new_session->early_alpn =
|
2017-07-12 22:35:14 +01:00
|
|
|
(uint8_t *)BUF_memdup(session->early_alpn, session->early_alpn_len);
|
2017-02-14 18:20:40 +00:00
|
|
|
if (new_session->early_alpn == NULL) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return nullptr;
|
2017-02-14 18:20:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
new_session->early_alpn_len = session->early_alpn_len;
|
2016-07-29 19:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the ticket. */
|
|
|
|
if (dup_flags & SSL_SESSION_INCLUDE_TICKET) {
|
|
|
|
if (session->tlsext_tick != NULL) {
|
|
|
|
new_session->tlsext_tick =
|
2017-07-12 22:35:14 +01:00
|
|
|
(uint8_t *)BUF_memdup(session->tlsext_tick, session->tlsext_ticklen);
|
2016-07-29 19:32:55 +01:00
|
|
|
if (new_session->tlsext_tick == NULL) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return nullptr;
|
2016-07-29 19:32:55 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
new_session->tlsext_ticklen = session->tlsext_ticklen;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The new_session does not get a copy of the ex_data. */
|
|
|
|
|
2016-06-27 21:34:59 +01:00
|
|
|
new_session->not_resumable = 1;
|
|
|
|
return new_session;
|
|
|
|
}
|
|
|
|
|
2017-01-28 19:00:32 +00:00
|
|
|
void ssl_session_rebase_time(SSL *ssl, SSL_SESSION *session) {
|
2017-02-20 22:00:20 +00:00
|
|
|
struct OPENSSL_timeval now;
|
2016-11-03 20:59:25 +00:00
|
|
|
ssl_get_current_time(ssl, &now);
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
/* To avoid overflows and underflows, if we've gone back in time, update the
|
|
|
|
* time, but mark the session expired. */
|
|
|
|
if (session->time > now.tv_sec) {
|
2016-11-03 20:59:25 +00:00
|
|
|
session->time = now.tv_sec;
|
|
|
|
session->timeout = 0;
|
2017-01-28 19:00:32 +00:00
|
|
|
session->auth_timeout = 0;
|
2016-11-03 20:59:25 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-01-28 19:00:32 +00:00
|
|
|
/* Adjust the session time and timeouts. If the session has already expired,
|
|
|
|
* clamp the timeouts at zero. */
|
2017-02-20 22:00:20 +00:00
|
|
|
uint64_t delta = now.tv_sec - session->time;
|
2016-11-03 20:59:25 +00:00
|
|
|
session->time = now.tv_sec;
|
|
|
|
if (session->timeout < delta) {
|
|
|
|
session->timeout = 0;
|
|
|
|
} else {
|
|
|
|
session->timeout -= delta;
|
|
|
|
}
|
2017-01-28 19:00:32 +00:00
|
|
|
if (session->auth_timeout < delta) {
|
|
|
|
session->auth_timeout = 0;
|
|
|
|
} else {
|
|
|
|
session->auth_timeout -= delta;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
void ssl_session_renew_timeout(SSL *ssl, SSL_SESSION *session,
|
|
|
|
uint32_t timeout) {
|
2017-01-28 19:00:32 +00:00
|
|
|
/* Rebase the timestamp relative to the current time so |timeout| is measured
|
|
|
|
* correctly. */
|
|
|
|
ssl_session_rebase_time(ssl, session);
|
|
|
|
|
|
|
|
if (session->timeout > timeout) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
session->timeout = timeout;
|
|
|
|
if (session->timeout > session->auth_timeout) {
|
|
|
|
session->timeout = session->auth_timeout;
|
|
|
|
}
|
2016-11-03 20:59:25 +00:00
|
|
|
}
|
|
|
|
|
2017-06-20 15:55:02 +01:00
|
|
|
uint16_t SSL_SESSION_protocol_version(const SSL_SESSION *session) {
|
|
|
|
uint16_t ret;
|
|
|
|
if (!ssl_protocol_version_from_wire(&ret, session->ssl_version)) {
|
|
|
|
/* An |SSL_SESSION| will never have an invalid version. This is enforced by
|
|
|
|
* the parser. */
|
|
|
|
assert(0);
|
|
|
|
return 0;
|
2017-01-12 18:17:07 +00:00
|
|
|
}
|
|
|
|
|
2017-06-20 15:55:02 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
const EVP_MD *SSL_SESSION_get_digest(const SSL_SESSION *session) {
|
2017-08-09 20:02:34 +01:00
|
|
|
return ssl_get_handshake_digest(SSL_SESSION_protocol_version(session),
|
|
|
|
session->cipher);
|
2017-01-12 18:17:07 +00:00
|
|
|
}
|
|
|
|
|
2016-11-17 08:20:47 +00:00
|
|
|
int ssl_get_new_session(SSL_HANDSHAKE *hs, int is_server) {
|
|
|
|
SSL *const ssl = hs->ssl;
|
2015-10-18 17:50:32 +01:00
|
|
|
if (ssl->mode & SSL_MODE_NO_SESSION_CREATION) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_SESSION_MAY_NOT_BE_CREATED);
|
2014-12-19 01:42:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-20 19:49:15 +01:00
|
|
|
UniquePtr<SSL_SESSION> session = ssl_session_new(ssl->ctx->x509_method);
|
2015-10-18 17:50:32 +01:00
|
|
|
if (session == NULL) {
|
2014-12-19 01:42:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-12-12 18:51:00 +00:00
|
|
|
session->is_server = is_server;
|
|
|
|
session->ssl_version = ssl->version;
|
|
|
|
|
2016-08-03 18:13:17 +01:00
|
|
|
/* Fill in the time from the |SSL_CTX|'s clock. */
|
2017-02-20 22:00:20 +00:00
|
|
|
struct OPENSSL_timeval now;
|
2016-08-03 18:13:17 +01:00
|
|
|
ssl_get_current_time(ssl, &now);
|
|
|
|
session->time = now.tv_sec;
|
|
|
|
|
2017-01-28 19:00:32 +00:00
|
|
|
uint16_t version = ssl3_protocol_version(ssl);
|
|
|
|
if (version >= TLS1_3_VERSION) {
|
|
|
|
/* TLS 1.3 uses tickets as authenticators, so we are willing to use them for
|
|
|
|
* longer. */
|
2017-03-10 21:08:36 +00:00
|
|
|
session->timeout = ssl->session_ctx->session_psk_dhe_timeout;
|
2017-01-28 19:00:32 +00:00
|
|
|
session->auth_timeout = SSL_DEFAULT_SESSION_AUTH_TIMEOUT;
|
|
|
|
} else {
|
|
|
|
/* TLS 1.2 resumption does not incorporate new key material, so we use a
|
|
|
|
* much shorter timeout. */
|
2017-03-10 21:08:36 +00:00
|
|
|
session->timeout = ssl->session_ctx->session_timeout;
|
|
|
|
session->auth_timeout = ssl->session_ctx->session_timeout;
|
2017-01-28 19:00:32 +00:00
|
|
|
}
|
2014-12-19 01:42:32 +00:00
|
|
|
|
2015-10-18 17:50:32 +01:00
|
|
|
if (is_server) {
|
2017-01-28 19:00:32 +00:00
|
|
|
if (hs->ticket_expected || version >= TLS1_3_VERSION) {
|
2015-10-18 17:50:32 +01:00
|
|
|
/* Don't set session IDs for sessions resumed with tickets. This will keep
|
|
|
|
* them out of the session cache. */
|
|
|
|
session->session_id_length = 0;
|
2014-12-19 01:42:32 +00:00
|
|
|
} else {
|
2015-10-18 17:50:32 +01:00
|
|
|
session->session_id_length = SSL3_SSL_SESSION_ID_LENGTH;
|
|
|
|
if (!RAND_bytes(session->session_id, session->session_id_length)) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return 0;
|
2015-10-18 17:50:32 +01:00
|
|
|
}
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
} else {
|
2015-10-18 17:50:32 +01:00
|
|
|
session->session_id_length = 0;
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2017-02-15 01:07:11 +00:00
|
|
|
if (ssl->cert->sid_ctx_length > sizeof(session->sid_ctx)) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
|
2017-07-20 19:49:15 +01:00
|
|
|
return 0;
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
2017-02-15 01:07:11 +00:00
|
|
|
OPENSSL_memcpy(session->sid_ctx, ssl->cert->sid_ctx,
|
|
|
|
ssl->cert->sid_ctx_length);
|
|
|
|
session->sid_ctx_length = ssl->cert->sid_ctx_length;
|
2014-12-19 01:42:32 +00:00
|
|
|
|
2016-06-27 21:34:59 +01:00
|
|
|
/* The session is marked not resumable until it is completely filled in. */
|
|
|
|
session->not_resumable = 1;
|
2016-07-18 18:17:16 +01:00
|
|
|
session->verify_result = X509_V_ERR_INVALID_CALL;
|
2014-12-19 01:42:32 +00:00
|
|
|
|
2017-07-20 19:49:15 +01:00
|
|
|
hs->new_session = std::move(session);
|
2016-09-01 06:10:07 +01:00
|
|
|
ssl_set_session(ssl, NULL);
|
2014-12-19 01:42:32 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2017-08-04 20:06:43 +01:00
|
|
|
int ssl_ctx_rotate_ticket_encryption_key(SSL_CTX *ctx) {
|
|
|
|
OPENSSL_timeval now;
|
|
|
|
ssl_ctx_get_current_time(ctx, &now);
|
|
|
|
{
|
|
|
|
/* Avoid acquiring a write lock in the common case (i.e. a non-default key
|
|
|
|
* is used or the default keys have not expired yet). */
|
|
|
|
MutexReadLock lock(&ctx->lock);
|
|
|
|
if (ctx->tlsext_ticket_key_current &&
|
|
|
|
(ctx->tlsext_ticket_key_current->next_rotation_tv_sec == 0 ||
|
|
|
|
ctx->tlsext_ticket_key_current->next_rotation_tv_sec > now.tv_sec) &&
|
|
|
|
(!ctx->tlsext_ticket_key_prev ||
|
|
|
|
ctx->tlsext_ticket_key_prev->next_rotation_tv_sec > now.tv_sec)) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
MutexWriteLock lock(&ctx->lock);
|
|
|
|
if (!ctx->tlsext_ticket_key_current ||
|
|
|
|
(ctx->tlsext_ticket_key_current->next_rotation_tv_sec != 0 &&
|
|
|
|
ctx->tlsext_ticket_key_current->next_rotation_tv_sec <= now.tv_sec)) {
|
|
|
|
/* The current key has not been initialized or it is expired. */
|
|
|
|
auto new_key = bssl::MakeUnique<struct tlsext_ticket_key>();
|
|
|
|
if (!new_key) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
OPENSSL_memset(new_key.get(), 0, sizeof(struct tlsext_ticket_key));
|
|
|
|
if (ctx->tlsext_ticket_key_current) {
|
|
|
|
/* The current key expired. Rotate it to prev and bump up its rotation
|
|
|
|
* timestamp. Note that even with the new rotation time it may still be
|
|
|
|
* expired and get droppped below. */
|
|
|
|
ctx->tlsext_ticket_key_current->next_rotation_tv_sec +=
|
|
|
|
SSL_DEFAULT_TICKET_KEY_ROTATION_INTERVAL;
|
|
|
|
OPENSSL_free(ctx->tlsext_ticket_key_prev);
|
|
|
|
ctx->tlsext_ticket_key_prev = ctx->tlsext_ticket_key_current;
|
|
|
|
}
|
|
|
|
ctx->tlsext_ticket_key_current = new_key.release();
|
|
|
|
RAND_bytes(ctx->tlsext_ticket_key_current->name, 16);
|
|
|
|
RAND_bytes(ctx->tlsext_ticket_key_current->hmac_key, 16);
|
|
|
|
RAND_bytes(ctx->tlsext_ticket_key_current->aes_key, 16);
|
|
|
|
ctx->tlsext_ticket_key_current->next_rotation_tv_sec =
|
|
|
|
now.tv_sec + SSL_DEFAULT_TICKET_KEY_ROTATION_INTERVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Drop an expired prev key. */
|
|
|
|
if (ctx->tlsext_ticket_key_prev &&
|
|
|
|
ctx->tlsext_ticket_key_prev->next_rotation_tv_sec <= now.tv_sec) {
|
|
|
|
OPENSSL_free(ctx->tlsext_ticket_key_prev);
|
|
|
|
ctx->tlsext_ticket_key_prev = nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-03-09 03:33:21 +00:00
|
|
|
static int ssl_encrypt_ticket_with_cipher_ctx(SSL *ssl, CBB *out,
|
|
|
|
const uint8_t *session_buf,
|
|
|
|
size_t session_len) {
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
ScopedEVP_CIPHER_CTX ctx;
|
|
|
|
ScopedHMAC_CTX hctx;
|
2016-07-27 16:10:52 +01:00
|
|
|
|
|
|
|
/* If the session is too long, emit a dummy value rather than abort the
|
|
|
|
* connection. */
|
|
|
|
static const size_t kMaxTicketOverhead =
|
|
|
|
16 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE;
|
|
|
|
if (session_len > 0xffff - kMaxTicketOverhead) {
|
|
|
|
static const char kTicketPlaceholder[] = "TICKET TOO LARGE";
|
2017-07-12 22:35:14 +01:00
|
|
|
return CBB_add_bytes(out, (const uint8_t *)kTicketPlaceholder,
|
|
|
|
strlen(kTicketPlaceholder));
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize HMAC and cipher contexts. If callback present it does all the
|
|
|
|
* work otherwise use generated values from parent ctx. */
|
2017-03-10 21:08:36 +00:00
|
|
|
SSL_CTX *tctx = ssl->session_ctx;
|
2016-07-27 16:10:52 +01:00
|
|
|
uint8_t iv[EVP_MAX_IV_LENGTH];
|
|
|
|
uint8_t key_name[16];
|
|
|
|
if (tctx->tlsext_ticket_key_cb != NULL) {
|
2017-07-12 22:35:14 +01:00
|
|
|
if (tctx->tlsext_ticket_key_cb(ssl, key_name, iv, ctx.get(), hctx.get(),
|
2016-07-27 16:10:52 +01:00
|
|
|
1 /* encrypt */) < 0) {
|
2017-07-12 22:35:14 +01:00
|
|
|
return 0;
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
} else {
|
2017-08-04 20:06:43 +01:00
|
|
|
/* Rotate ticket key if necessary. */
|
|
|
|
if (!ssl_ctx_rotate_ticket_encryption_key(tctx)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
MutexReadLock lock(&tctx->lock);
|
2016-07-27 16:10:52 +01:00
|
|
|
if (!RAND_bytes(iv, 16) ||
|
2017-07-12 22:35:14 +01:00
|
|
|
!EVP_EncryptInit_ex(ctx.get(), EVP_aes_128_cbc(), NULL,
|
2017-08-04 20:06:43 +01:00
|
|
|
tctx->tlsext_ticket_key_current->aes_key, iv) ||
|
|
|
|
!HMAC_Init_ex(hctx.get(), tctx->tlsext_ticket_key_current->hmac_key, 16,
|
2017-07-12 22:35:14 +01:00
|
|
|
tlsext_tick_md(), NULL)) {
|
|
|
|
return 0;
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
2017-08-04 20:06:43 +01:00
|
|
|
OPENSSL_memcpy(key_name, tctx->tlsext_ticket_key_current->name, 16);
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t *ptr;
|
|
|
|
if (!CBB_add_bytes(out, key_name, 16) ||
|
2017-07-12 22:35:14 +01:00
|
|
|
!CBB_add_bytes(out, iv, EVP_CIPHER_CTX_iv_length(ctx.get())) ||
|
2016-07-27 16:10:52 +01:00
|
|
|
!CBB_reserve(out, &ptr, session_len + EVP_MAX_BLOCK_LENGTH)) {
|
2017-07-12 22:35:14 +01:00
|
|
|
return 0;
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
size_t total = 0;
|
2016-09-22 06:21:24 +01:00
|
|
|
#if defined(BORINGSSL_UNSAFE_FUZZER_MODE)
|
2016-12-13 06:07:13 +00:00
|
|
|
OPENSSL_memcpy(ptr, session_buf, session_len);
|
2016-09-22 06:21:24 +01:00
|
|
|
total = session_len;
|
|
|
|
#else
|
|
|
|
int len;
|
2017-07-12 22:35:14 +01:00
|
|
|
if (!EVP_EncryptUpdate(ctx.get(), ptr + total, &len, session_buf, session_len)) {
|
|
|
|
return 0;
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
total += len;
|
2017-07-12 22:35:14 +01:00
|
|
|
if (!EVP_EncryptFinal_ex(ctx.get(), ptr + total, &len)) {
|
|
|
|
return 0;
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
total += len;
|
2016-09-22 06:21:24 +01:00
|
|
|
#endif
|
2016-07-27 16:10:52 +01:00
|
|
|
if (!CBB_did_write(out, total)) {
|
2017-07-12 22:35:14 +01:00
|
|
|
return 0;
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
unsigned hlen;
|
2017-07-12 22:35:14 +01:00
|
|
|
if (!HMAC_Update(hctx.get(), CBB_data(out), CBB_len(out)) ||
|
2016-07-27 16:10:52 +01:00
|
|
|
!CBB_reserve(out, &ptr, EVP_MAX_MD_SIZE) ||
|
2017-07-12 22:35:14 +01:00
|
|
|
!HMAC_Final(hctx.get(), ptr, &hlen) ||
|
2016-07-27 16:10:52 +01:00
|
|
|
!CBB_did_write(out, hlen)) {
|
2017-07-12 22:35:14 +01:00
|
|
|
return 0;
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
|
2017-07-12 22:35:14 +01:00
|
|
|
return 1;
|
2016-07-27 16:10:52 +01:00
|
|
|
}
|
|
|
|
|
2017-03-09 03:33:21 +00:00
|
|
|
static int ssl_encrypt_ticket_with_method(SSL *ssl, CBB *out,
|
|
|
|
const uint8_t *session_buf,
|
|
|
|
size_t session_len) {
|
|
|
|
const SSL_TICKET_AEAD_METHOD *method = ssl->session_ctx->ticket_aead_method;
|
|
|
|
const size_t max_overhead = method->max_overhead(ssl);
|
|
|
|
const size_t max_out = session_len + max_overhead;
|
|
|
|
if (max_out < max_overhead) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_OVERFLOW);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t *ptr;
|
|
|
|
if (!CBB_reserve(out, &ptr, max_out)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t out_len;
|
|
|
|
if (!method->seal(ssl, ptr, &out_len, max_out, session_buf, session_len)) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_TICKET_ENCRYPTION_FAILED);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!CBB_did_write(out, out_len)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ssl_encrypt_ticket(SSL *ssl, CBB *out, const SSL_SESSION *session) {
|
|
|
|
/* Serialize the SSL_SESSION to be encoded into the ticket. */
|
|
|
|
uint8_t *session_buf = NULL;
|
|
|
|
size_t session_len;
|
|
|
|
if (!SSL_SESSION_to_bytes_for_ticket(session, &session_buf, &session_len)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ret = 0;
|
|
|
|
if (ssl->session_ctx->ticket_aead_method) {
|
|
|
|
ret = ssl_encrypt_ticket_with_method(ssl, out, session_buf, session_len);
|
|
|
|
} else {
|
|
|
|
ret =
|
|
|
|
ssl_encrypt_ticket_with_cipher_ctx(ssl, out, session_buf, session_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
OPENSSL_free(session_buf);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-07-29 19:32:55 +01:00
|
|
|
int ssl_session_is_context_valid(const SSL *ssl, const SSL_SESSION *session) {
|
|
|
|
if (session == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-15 01:07:11 +00:00
|
|
|
return session->sid_ctx_length == ssl->cert->sid_ctx_length &&
|
|
|
|
OPENSSL_memcmp(session->sid_ctx, ssl->cert->sid_ctx,
|
|
|
|
ssl->cert->sid_ctx_length) == 0;
|
2016-07-29 19:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int ssl_session_is_time_valid(const SSL *ssl, const SSL_SESSION *session) {
|
|
|
|
if (session == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
struct OPENSSL_timeval now;
|
2016-07-29 19:32:55 +01:00
|
|
|
ssl_get_current_time(ssl, &now);
|
2016-10-27 21:36:32 +01:00
|
|
|
|
|
|
|
/* Reject tickets from the future to avoid underflow. */
|
2017-02-20 22:00:20 +00:00
|
|
|
if (now.tv_sec < session->time) {
|
2016-10-27 21:36:32 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
return session->timeout > now.tv_sec - session->time;
|
2016-07-29 19:32:55 +01:00
|
|
|
}
|
|
|
|
|
2017-02-10 01:01:26 +00:00
|
|
|
int ssl_session_is_resumable(const SSL_HANDSHAKE *hs,
|
|
|
|
const SSL_SESSION *session) {
|
|
|
|
const SSL *const ssl = hs->ssl;
|
2016-11-12 03:36:06 +00:00
|
|
|
return ssl_session_is_context_valid(ssl, session) &&
|
2016-12-12 18:51:00 +00:00
|
|
|
/* The session must have been created by the same type of end point as
|
|
|
|
* we're now using it with. */
|
2017-02-10 01:01:26 +00:00
|
|
|
ssl->server == session->is_server &&
|
2016-11-12 03:36:06 +00:00
|
|
|
/* The session must not be expired. */
|
|
|
|
ssl_session_is_time_valid(ssl, session) &&
|
|
|
|
/* Only resume if the session's version matches the negotiated
|
|
|
|
* version. */
|
|
|
|
ssl->version == session->ssl_version &&
|
Negotiate ciphers before resumption.
This changes our resumption strategy. Before, we would negotiate ciphers
only on fresh handshakes. On resumption, we would blindly use whatever
was in the session.
Instead, evaluate cipher suite preferences on every handshake.
Resumption requires that the saved cipher suite match the one that would
have been negotiated anyway. If client or server preferences changed
sufficiently, we decline the session.
This is much easier to reason about (we always pick the best cipher
suite), simpler, and avoids getting stuck under old preferences if
tickets are continuously renewed. Notably, although TLS 1.2 ticket
renewal does not work in practice, TLS 1.3 will renew tickets like
there's no tomorrow.
It also means we don't need dedicated code to avoid resuming a cipher
which has since been disabled. (That dedicated code was a little odd
anyway since the mask_k, etc., checks didn't occur. When cert_cb was
skipped on resumption, one could resume without ever configuring a
certificate! So we couldn't know whether to mask off RSA or ECDSA cipher
suites.)
Add tests which assert on this new arrangement.
BUG=116
Change-Id: Id40d851ccd87e06c46c6ec272527fd8ece8abfc6
Reviewed-on: https://boringssl-review.googlesource.com/11847
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2016-11-16 10:05:33 +00:00
|
|
|
/* Only resume if the session's cipher matches the negotiated one. */
|
2017-02-10 01:01:26 +00:00
|
|
|
hs->new_cipher == session->cipher &&
|
2016-11-17 01:53:09 +00:00
|
|
|
/* If the session contains a client certificate (either the full
|
|
|
|
* certificate or just the hash) then require that the form of the
|
|
|
|
* certificate matches the current configuration. */
|
2017-02-01 23:49:37 +00:00
|
|
|
((sk_CRYPTO_BUFFER_num(session->certs) == 0 &&
|
|
|
|
!session->peer_sha256_valid) ||
|
2016-11-17 01:53:09 +00:00
|
|
|
session->peer_sha256_valid ==
|
|
|
|
ssl->retain_only_sha256_of_client_certs);
|
2016-11-12 03:36:06 +00:00
|
|
|
}
|
|
|
|
|
2015-06-16 20:34:50 +01:00
|
|
|
/* ssl_lookup_session looks up |session_id| in the session cache and sets
|
2017-07-29 06:42:16 +01:00
|
|
|
* |*out_session| to an |SSL_SESSION| object if found. */
|
2015-06-16 20:34:50 +01:00
|
|
|
static enum ssl_session_result_t ssl_lookup_session(
|
2017-07-29 06:42:16 +01:00
|
|
|
SSL *ssl, UniquePtr<SSL_SESSION> *out_session, const uint8_t *session_id,
|
2015-06-16 20:34:50 +01:00
|
|
|
size_t session_id_len) {
|
2017-07-29 06:42:16 +01:00
|
|
|
out_session->reset();
|
2014-12-19 01:42:32 +00:00
|
|
|
|
2015-06-16 20:34:50 +01:00
|
|
|
if (session_id_len == 0 || session_id_len > SSL_MAX_SSL_SESSION_ID_LENGTH) {
|
|
|
|
return ssl_session_success;
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2017-07-29 06:42:16 +01:00
|
|
|
UniquePtr<SSL_SESSION> session;
|
2015-06-16 20:34:50 +01:00
|
|
|
/* Try the internal cache, if it exists. */
|
2017-03-10 21:08:36 +00:00
|
|
|
if (!(ssl->session_ctx->session_cache_mode &
|
2014-12-19 01:42:32 +00:00
|
|
|
SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) {
|
|
|
|
SSL_SESSION data;
|
2015-06-16 20:34:50 +01:00
|
|
|
data.ssl_version = ssl->version;
|
|
|
|
data.session_id_length = session_id_len;
|
2016-12-13 06:07:13 +00:00
|
|
|
OPENSSL_memcpy(data.session_id, session_id, session_id_len);
|
2015-06-16 20:34:50 +01:00
|
|
|
|
2017-03-10 21:08:36 +00:00
|
|
|
CRYPTO_MUTEX_lock_read(&ssl->session_ctx->lock);
|
2017-07-29 06:42:16 +01:00
|
|
|
session.reset(lh_SSL_SESSION_retrieve(ssl->session_ctx->sessions, &data));
|
|
|
|
if (session) {
|
|
|
|
/* |lh_SSL_SESSION_retrieve| returns a non-owning pointer. */
|
|
|
|
SSL_SESSION_up_ref(session.get());
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
2015-10-18 19:28:01 +01:00
|
|
|
/* TODO(davidben): This should probably move it to the front of the list. */
|
2017-03-10 21:08:36 +00:00
|
|
|
CRYPTO_MUTEX_unlock_read(&ssl->session_ctx->lock);
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2015-06-16 20:34:50 +01:00
|
|
|
/* Fall back to the external cache, if it exists. */
|
2017-07-29 06:42:16 +01:00
|
|
|
if (!session && ssl->session_ctx->get_session_cb != NULL) {
|
2016-07-29 19:32:55 +01:00
|
|
|
int copy = 1;
|
2017-07-29 06:42:16 +01:00
|
|
|
session.reset(ssl->session_ctx->get_session_cb(ssl, (uint8_t *)session_id,
|
|
|
|
session_id_len, ©));
|
2016-07-29 19:32:55 +01:00
|
|
|
|
2017-07-29 06:42:16 +01:00
|
|
|
if (!session) {
|
2016-08-26 17:22:56 +01:00
|
|
|
return ssl_session_success;
|
|
|
|
}
|
|
|
|
|
2017-07-29 06:42:16 +01:00
|
|
|
if (session.get() == SSL_magic_pending_session_ptr()) {
|
|
|
|
session.release(); // This pointer is not actually owned.
|
2016-07-29 19:32:55 +01:00
|
|
|
return ssl_session_retry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Increment reference count now if the session callback asks us to do so
|
|
|
|
* (note that if the session structures returned by the callback are shared
|
|
|
|
* between threads, it must handle the reference count itself [i.e. copy ==
|
|
|
|
* 0], or things won't be thread-safe). */
|
|
|
|
if (copy) {
|
2017-07-29 06:42:16 +01:00
|
|
|
SSL_SESSION_up_ref(session.get());
|
2016-07-29 19:32:55 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Add the externally cached session to the internal cache if necessary. */
|
2017-03-10 21:08:36 +00:00
|
|
|
if (!(ssl->session_ctx->session_cache_mode &
|
2016-07-29 19:32:55 +01:00
|
|
|
SSL_SESS_CACHE_NO_INTERNAL_STORE)) {
|
2017-07-29 06:42:16 +01:00
|
|
|
SSL_CTX_add_session(ssl->session_ctx, session.get());
|
2016-07-29 19:32:55 +01:00
|
|
|
}
|
2015-06-16 20:34:50 +01:00
|
|
|
}
|
2016-07-29 19:32:55 +01:00
|
|
|
|
2017-07-29 06:42:16 +01:00
|
|
|
if (session && !ssl_session_is_time_valid(ssl, session.get())) {
|
2016-07-29 19:32:55 +01:00
|
|
|
/* The session was from the cache, so remove it. */
|
2017-07-29 06:42:16 +01:00
|
|
|
SSL_CTX_remove_session(ssl->session_ctx, session.get());
|
|
|
|
session.reset();
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2017-07-29 06:42:16 +01:00
|
|
|
*out_session = std::move(session);
|
2015-06-16 20:34:50 +01:00
|
|
|
return ssl_session_success;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum ssl_session_result_t ssl_get_prev_session(
|
2017-07-29 06:42:16 +01:00
|
|
|
SSL *ssl, UniquePtr<SSL_SESSION> *out_session, int *out_tickets_supported,
|
2016-12-04 04:15:13 +00:00
|
|
|
int *out_renew_ticket, const SSL_CLIENT_HELLO *client_hello) {
|
2015-06-16 20:34:50 +01:00
|
|
|
/* This is used only by servers. */
|
|
|
|
assert(ssl->server);
|
2017-07-29 06:42:16 +01:00
|
|
|
UniquePtr<SSL_SESSION> session;
|
2015-11-21 19:05:44 +00:00
|
|
|
int renew_ticket = 0;
|
2015-06-16 20:34:50 +01:00
|
|
|
|
|
|
|
/* If tickets are disabled, always behave as if no tickets are present. */
|
2015-07-01 23:45:03 +01:00
|
|
|
const uint8_t *ticket = NULL;
|
|
|
|
size_t ticket_len = 0;
|
2015-06-16 20:34:50 +01:00
|
|
|
const int tickets_supported =
|
|
|
|
!(SSL_get_options(ssl) & SSL_OP_NO_TICKET) &&
|
2015-10-10 00:32:41 +01:00
|
|
|
ssl->version > SSL3_VERSION &&
|
2016-12-04 04:15:13 +00:00
|
|
|
SSL_early_callback_ctx_extension_get(
|
|
|
|
client_hello, TLSEXT_TYPE_session_ticket, &ticket, &ticket_len);
|
2015-11-21 19:05:44 +00:00
|
|
|
if (tickets_supported && ticket_len > 0) {
|
2017-03-09 03:33:21 +00:00
|
|
|
switch (ssl_process_ticket(ssl, &session, &renew_ticket, ticket, ticket_len,
|
|
|
|
client_hello->session_id,
|
|
|
|
client_hello->session_id_len)) {
|
|
|
|
case ssl_ticket_aead_success:
|
|
|
|
break;
|
|
|
|
case ssl_ticket_aead_ignore_ticket:
|
2017-07-29 06:42:16 +01:00
|
|
|
assert(!session);
|
2017-03-09 03:33:21 +00:00
|
|
|
break;
|
|
|
|
case ssl_ticket_aead_error:
|
|
|
|
return ssl_session_error;
|
|
|
|
case ssl_ticket_aead_retry:
|
|
|
|
return ssl_session_ticket_retry;
|
2015-06-16 20:34:50 +01:00
|
|
|
}
|
|
|
|
} else {
|
2015-11-21 19:05:44 +00:00
|
|
|
/* The client didn't send a ticket, so the session ID is a real ID. */
|
2015-06-16 20:34:50 +01:00
|
|
|
enum ssl_session_result_t lookup_ret = ssl_lookup_session(
|
2016-12-04 04:15:13 +00:00
|
|
|
ssl, &session, client_hello->session_id, client_hello->session_id_len);
|
2015-06-16 20:34:50 +01:00
|
|
|
if (lookup_ret != ssl_session_success) {
|
|
|
|
return lookup_ret;
|
|
|
|
}
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2017-07-29 06:42:16 +01:00
|
|
|
*out_session = std::move(session);
|
2016-11-12 03:36:06 +00:00
|
|
|
*out_tickets_supported = tickets_supported;
|
|
|
|
*out_renew_ticket = renew_ticket;
|
2015-06-16 20:34:50 +01:00
|
|
|
return ssl_session_success;
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *session, int lock) {
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (session != NULL && session->session_id_length != 0) {
|
|
|
|
if (lock) {
|
|
|
|
CRYPTO_MUTEX_lock_write(&ctx->lock);
|
|
|
|
}
|
|
|
|
SSL_SESSION *found_session = lh_SSL_SESSION_retrieve(ctx->sessions,
|
|
|
|
session);
|
|
|
|
if (found_session == session) {
|
|
|
|
ret = 1;
|
|
|
|
found_session = lh_SSL_SESSION_delete(ctx->sessions, session);
|
|
|
|
SSL_SESSION_list_remove(ctx, session);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lock) {
|
|
|
|
CRYPTO_MUTEX_unlock_write(&ctx->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
if (ctx->remove_session_cb != NULL) {
|
|
|
|
ctx->remove_session_cb(ctx, found_session);
|
|
|
|
}
|
|
|
|
SSL_SESSION_free(found_session);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ssl_set_session(SSL *ssl, SSL_SESSION *session) {
|
|
|
|
if (ssl->session == session) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
SSL_SESSION_free(ssl->session);
|
|
|
|
ssl->session = session;
|
|
|
|
if (session != NULL) {
|
|
|
|
SSL_SESSION_up_ref(session);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* locked by SSL_CTX in the calling function */
|
|
|
|
static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *session) {
|
|
|
|
if (session->next == NULL || session->prev == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (session->next == (SSL_SESSION *)&ctx->session_cache_tail) {
|
|
|
|
/* last element in list */
|
|
|
|
if (session->prev == (SSL_SESSION *)&ctx->session_cache_head) {
|
|
|
|
/* only one element in list */
|
|
|
|
ctx->session_cache_head = NULL;
|
|
|
|
ctx->session_cache_tail = NULL;
|
|
|
|
} else {
|
|
|
|
ctx->session_cache_tail = session->prev;
|
|
|
|
session->prev->next = (SSL_SESSION *)&(ctx->session_cache_tail);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (session->prev == (SSL_SESSION *)&ctx->session_cache_head) {
|
|
|
|
/* first element in list */
|
|
|
|
ctx->session_cache_head = session->next;
|
|
|
|
session->next->prev = (SSL_SESSION *)&(ctx->session_cache_head);
|
|
|
|
} else { /* middle of list */
|
|
|
|
session->next->prev = session->prev;
|
|
|
|
session->prev->next = session->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
session->prev = session->next = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *session) {
|
|
|
|
if (session->next != NULL && session->prev != NULL) {
|
|
|
|
SSL_SESSION_list_remove(ctx, session);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx->session_cache_head == NULL) {
|
|
|
|
ctx->session_cache_head = session;
|
|
|
|
ctx->session_cache_tail = session;
|
|
|
|
session->prev = (SSL_SESSION *)&(ctx->session_cache_head);
|
|
|
|
session->next = (SSL_SESSION *)&(ctx->session_cache_tail);
|
|
|
|
} else {
|
|
|
|
session->next = ctx->session_cache_head;
|
|
|
|
session->next->prev = session;
|
|
|
|
session->prev = (SSL_SESSION *)&(ctx->session_cache_head);
|
|
|
|
ctx->session_cache_head = session;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace bssl
|
|
|
|
|
|
|
|
using namespace bssl;
|
|
|
|
|
|
|
|
SSL_SESSION *SSL_SESSION_new(const SSL_CTX *ctx) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return ssl_session_new(ctx->x509_method).release();
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_SESSION_up_ref(SSL_SESSION *session) {
|
|
|
|
CRYPTO_refcount_inc(&session->references);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_SESSION_free(SSL_SESSION *session) {
|
|
|
|
if (session == NULL ||
|
|
|
|
!CRYPTO_refcount_dec_and_test_zero(&session->references)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
CRYPTO_free_ex_data(&g_ex_data_class, session, &session->ex_data);
|
|
|
|
|
|
|
|
OPENSSL_cleanse(session->master_key, sizeof(session->master_key));
|
|
|
|
OPENSSL_cleanse(session->session_id, sizeof(session->session_id));
|
|
|
|
sk_CRYPTO_BUFFER_pop_free(session->certs, CRYPTO_BUFFER_free);
|
|
|
|
session->x509_method->session_clear(session);
|
|
|
|
OPENSSL_free(session->tlsext_hostname);
|
|
|
|
OPENSSL_free(session->tlsext_tick);
|
2017-08-22 23:07:51 +01:00
|
|
|
CRYPTO_BUFFER_free(session->signed_cert_timestamp_list);
|
|
|
|
CRYPTO_BUFFER_free(session->ocsp_response);
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
OPENSSL_free(session->psk_identity);
|
|
|
|
OPENSSL_free(session->early_alpn);
|
|
|
|
OPENSSL_cleanse(session, sizeof(*session));
|
|
|
|
OPENSSL_free(session);
|
|
|
|
}
|
|
|
|
|
|
|
|
const uint8_t *SSL_SESSION_get_id(const SSL_SESSION *session,
|
|
|
|
unsigned *out_len) {
|
|
|
|
if (out_len != NULL) {
|
|
|
|
*out_len = session->session_id_length;
|
|
|
|
}
|
|
|
|
return session->session_id;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t SSL_SESSION_get_timeout(const SSL_SESSION *session) {
|
|
|
|
return session->timeout;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t SSL_SESSION_get_time(const SSL_SESSION *session) {
|
|
|
|
if (session == NULL) {
|
|
|
|
/* NULL should crash, but silently accept it here for compatibility. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return session->time;
|
|
|
|
}
|
|
|
|
|
|
|
|
X509 *SSL_SESSION_get0_peer(const SSL_SESSION *session) {
|
|
|
|
return session->x509_peer;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t SSL_SESSION_get_master_key(const SSL_SESSION *session, uint8_t *out,
|
|
|
|
size_t max_out) {
|
|
|
|
/* TODO(davidben): Fix master_key_length's type and remove these casts. */
|
|
|
|
if (max_out == 0) {
|
|
|
|
return (size_t)session->master_key_length;
|
|
|
|
}
|
|
|
|
if (max_out > (size_t)session->master_key_length) {
|
|
|
|
max_out = (size_t)session->master_key_length;
|
|
|
|
}
|
|
|
|
OPENSSL_memcpy(out, session->master_key, max_out);
|
|
|
|
return max_out;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint64_t SSL_SESSION_set_time(SSL_SESSION *session, uint64_t time) {
|
|
|
|
if (session == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
session->time = time;
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t SSL_SESSION_set_timeout(SSL_SESSION *session, uint32_t timeout) {
|
|
|
|
if (session == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
session->timeout = timeout;
|
|
|
|
session->auth_timeout = timeout;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_SESSION_set1_id_context(SSL_SESSION *session, const uint8_t *sid_ctx,
|
|
|
|
size_t sid_ctx_len) {
|
|
|
|
if (sid_ctx_len > sizeof(session->sid_ctx)) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-08-01 00:09:42 +01:00
|
|
|
static_assert(sizeof(session->sid_ctx) < 256, "sid_ctx_len does not fit");
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
session->sid_ctx_length = (uint8_t)sid_ctx_len;
|
|
|
|
OPENSSL_memcpy(session->sid_ctx, sid_ctx, sid_ctx_len);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
SSL_SESSION *SSL_magic_pending_session_ptr(void) {
|
|
|
|
return (SSL_SESSION *)&g_pending_session_magic;
|
|
|
|
}
|
|
|
|
|
|
|
|
SSL_SESSION *SSL_get_session(const SSL *ssl) {
|
|
|
|
/* Once the handshake completes we return the established session. Otherwise
|
|
|
|
* we return the intermediate session, either |session| (for resumption) or
|
|
|
|
* |new_session| if doing a full handshake. */
|
|
|
|
if (!SSL_in_init(ssl)) {
|
|
|
|
return ssl->s3->established_session;
|
|
|
|
}
|
|
|
|
SSL_HANDSHAKE *hs = ssl->s3->hs;
|
2017-07-20 19:49:15 +01:00
|
|
|
if (hs->early_session) {
|
|
|
|
return hs->early_session.get();
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
2017-07-20 19:49:15 +01:00
|
|
|
if (hs->new_session) {
|
|
|
|
return hs->new_session.get();
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
return ssl->session;
|
|
|
|
}
|
|
|
|
|
|
|
|
SSL_SESSION *SSL_get1_session(SSL *ssl) {
|
|
|
|
SSL_SESSION *ret = SSL_get_session(ssl);
|
|
|
|
if (ret != NULL) {
|
|
|
|
SSL_SESSION_up_ref(ret);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_SESSION_get_ex_new_index(long argl, void *argp,
|
|
|
|
CRYPTO_EX_unused *unused,
|
|
|
|
CRYPTO_EX_dup *dup_unused,
|
|
|
|
CRYPTO_EX_free *free_func) {
|
|
|
|
int index;
|
|
|
|
if (!CRYPTO_get_ex_new_index(&g_ex_data_class, &index, argl, argp,
|
|
|
|
free_func)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_SESSION_set_ex_data(SSL_SESSION *session, int idx, void *arg) {
|
|
|
|
return CRYPTO_set_ex_data(&session->ex_data, idx, arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
void *SSL_SESSION_get_ex_data(const SSL_SESSION *session, int idx) {
|
|
|
|
return CRYPTO_get_ex_data(&session->ex_data, idx);
|
|
|
|
}
|
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *session) {
|
2015-10-18 20:08:57 +01:00
|
|
|
/* Although |session| is inserted into two structures (a doubly-linked list
|
|
|
|
* and the hash table), |ctx| only takes one reference. */
|
2015-09-14 06:40:10 +01:00
|
|
|
SSL_SESSION_up_ref(session);
|
2014-12-19 01:42:32 +00:00
|
|
|
|
2015-10-18 20:08:57 +01:00
|
|
|
SSL_SESSION *old_session;
|
2015-05-15 23:29:21 +01:00
|
|
|
CRYPTO_MUTEX_lock_write(&ctx->lock);
|
2015-09-14 06:40:10 +01:00
|
|
|
if (!lh_SSL_SESSION_insert(ctx->sessions, &old_session, session)) {
|
2016-05-24 16:28:36 +01:00
|
|
|
CRYPTO_MUTEX_unlock_write(&ctx->lock);
|
2015-09-14 06:40:10 +01:00
|
|
|
SSL_SESSION_free(session);
|
2014-12-19 01:42:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-10-18 20:08:57 +01:00
|
|
|
if (old_session != NULL) {
|
|
|
|
if (old_session == session) {
|
|
|
|
/* |session| was already in the cache. */
|
2016-05-24 16:28:36 +01:00
|
|
|
CRYPTO_MUTEX_unlock_write(&ctx->lock);
|
2015-10-18 20:08:57 +01:00
|
|
|
SSL_SESSION_free(old_session);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* There was a session ID collision. |old_session| must be removed from
|
|
|
|
* the linked list and released. */
|
2015-09-14 06:40:10 +01:00
|
|
|
SSL_SESSION_list_remove(ctx, old_session);
|
|
|
|
SSL_SESSION_free(old_session);
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2015-10-18 20:08:57 +01:00
|
|
|
SSL_SESSION_list_add(ctx, session);
|
2014-12-19 01:42:32 +00:00
|
|
|
|
2015-10-18 20:08:57 +01:00
|
|
|
/* Enforce any cache size limits. */
|
|
|
|
if (SSL_CTX_sess_get_cache_size(ctx) > 0) {
|
|
|
|
while (SSL_CTX_sess_number(ctx) > SSL_CTX_sess_get_cache_size(ctx)) {
|
|
|
|
if (!remove_session_lock(ctx, ctx->session_cache_tail, 0)) {
|
|
|
|
break;
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-24 16:28:36 +01:00
|
|
|
CRYPTO_MUTEX_unlock_write(&ctx->lock);
|
2015-10-18 20:08:57 +01:00
|
|
|
return 1;
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
int SSL_CTX_remove_session(SSL_CTX *ctx, SSL_SESSION *session) {
|
|
|
|
return remove_session_lock(ctx, session, 1);
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
int SSL_set_session(SSL *ssl, SSL_SESSION *session) {
|
2016-09-01 06:10:07 +01:00
|
|
|
/* SSL_set_session may only be called before the handshake has started. */
|
2017-02-11 04:14:17 +00:00
|
|
|
if (ssl->s3->initial_handshake_complete ||
|
|
|
|
ssl->s3->hs == NULL ||
|
|
|
|
ssl->s3->hs->state != SSL_ST_INIT) {
|
2016-09-01 06:10:07 +01:00
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
ssl_set_session(ssl, session);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
uint32_t SSL_CTX_set_timeout(SSL_CTX *ctx, uint32_t timeout) {
|
2015-09-14 06:40:10 +01:00
|
|
|
if (ctx == NULL) {
|
2014-12-19 01:42:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-01-28 19:32:53 +00:00
|
|
|
/* Historically, zero was treated as |SSL_DEFAULT_SESSION_TIMEOUT|. */
|
|
|
|
if (timeout == 0) {
|
|
|
|
timeout = SSL_DEFAULT_SESSION_TIMEOUT;
|
|
|
|
}
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
uint32_t old_timeout = ctx->session_timeout;
|
2015-09-14 06:40:10 +01:00
|
|
|
ctx->session_timeout = timeout;
|
|
|
|
return old_timeout;
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
uint32_t SSL_CTX_get_timeout(const SSL_CTX *ctx) {
|
2015-09-14 06:40:10 +01:00
|
|
|
if (ctx == NULL) {
|
2014-12-19 01:42:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
return ctx->session_timeout;
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
void SSL_CTX_set_session_psk_dhe_timeout(SSL_CTX *ctx, uint32_t timeout) {
|
2017-01-28 19:00:32 +00:00
|
|
|
ctx->session_psk_dhe_timeout = timeout;
|
|
|
|
}
|
|
|
|
|
2014-12-19 01:42:32 +00:00
|
|
|
typedef struct timeout_param_st {
|
|
|
|
SSL_CTX *ctx;
|
2017-02-20 22:00:20 +00:00
|
|
|
uint64_t time;
|
2015-05-03 20:21:28 +01:00
|
|
|
LHASH_OF(SSL_SESSION) *cache;
|
2014-12-19 01:42:32 +00:00
|
|
|
} TIMEOUT_PARAM;
|
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
static void timeout_doall_arg(SSL_SESSION *session, void *void_param) {
|
2017-07-12 22:35:14 +01:00
|
|
|
TIMEOUT_PARAM *param = reinterpret_cast<TIMEOUT_PARAM *>(void_param);
|
2014-12-19 01:42:32 +00:00
|
|
|
|
|
|
|
if (param->time == 0 ||
|
2017-02-20 22:00:20 +00:00
|
|
|
session->time + session->timeout < session->time ||
|
2015-09-14 06:40:10 +01:00
|
|
|
param->time > (session->time + session->timeout)) {
|
2014-12-19 01:42:32 +00:00
|
|
|
/* timeout */
|
|
|
|
/* The reason we don't call SSL_CTX_remove_session() is to
|
|
|
|
* save on locking overhead */
|
2015-09-14 06:40:10 +01:00
|
|
|
(void) lh_SSL_SESSION_delete(param->cache, session);
|
|
|
|
SSL_SESSION_list_remove(param->ctx, session);
|
2014-12-19 01:42:32 +00:00
|
|
|
if (param->ctx->remove_session_cb != NULL) {
|
2015-09-14 06:40:10 +01:00
|
|
|
param->ctx->remove_session_cb(param->ctx, session);
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
2015-09-14 06:40:10 +01:00
|
|
|
SSL_SESSION_free(session);
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-20 22:00:20 +00:00
|
|
|
void SSL_CTX_flush_sessions(SSL_CTX *ctx, uint64_t time) {
|
2014-12-19 01:42:32 +00:00
|
|
|
TIMEOUT_PARAM tp;
|
|
|
|
|
2015-05-15 23:29:21 +01:00
|
|
|
tp.ctx = ctx;
|
|
|
|
tp.cache = ctx->sessions;
|
2014-12-19 01:42:32 +00:00
|
|
|
if (tp.cache == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
2015-09-14 06:40:10 +01:00
|
|
|
tp.time = time;
|
2015-05-15 23:29:21 +01:00
|
|
|
CRYPTO_MUTEX_lock_write(&ctx->lock);
|
2014-12-19 01:42:32 +00:00
|
|
|
lh_SSL_SESSION_doall_arg(tp.cache, timeout_doall_arg, &tp);
|
2016-05-24 16:28:36 +01:00
|
|
|
CRYPTO_MUTEX_unlock_write(&ctx->lock);
|
2014-12-19 01:42:32 +00:00
|
|
|
}
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
|
2015-09-14 06:40:10 +01:00
|
|
|
int (*cb)(SSL *ssl, SSL_SESSION *session)) {
|
2014-12-19 01:42:32 +00:00
|
|
|
ctx->new_session_cb = cb;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(SSL *ssl, SSL_SESSION *session) {
|
2014-12-19 01:42:32 +00:00
|
|
|
return ctx->new_session_cb;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
void SSL_CTX_sess_set_remove_cb(
|
|
|
|
SSL_CTX *ctx, void (*cb)(SSL_CTX *ctx, SSL_SESSION *session)) {
|
2014-12-19 01:42:32 +00:00
|
|
|
ctx->remove_session_cb = cb;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2014-12-19 01:42:32 +00:00
|
|
|
void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(SSL_CTX *ctx,
|
2015-09-14 06:40:10 +01:00
|
|
|
SSL_SESSION *session) {
|
2014-12-19 01:42:32 +00:00
|
|
|
return ctx->remove_session_cb;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
|
|
|
void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
|
2015-09-14 06:40:10 +01:00
|
|
|
SSL_SESSION *(*cb)(SSL *ssl,
|
|
|
|
uint8_t *id, int id_len,
|
|
|
|
int *out_copy)) {
|
2014-12-19 01:42:32 +00:00
|
|
|
ctx->get_session_cb = cb;
|
|
|
|
}
|
|
|
|
|
2015-09-14 06:40:10 +01:00
|
|
|
SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(
|
|
|
|
SSL *ssl, uint8_t *id, int id_len, int *out_copy) {
|
2014-12-19 01:42:32 +00:00
|
|
|
return ctx->get_session_cb;
|
|
|
|
}
|
|
|
|
|
2015-10-18 03:51:17 +01:00
|
|
|
void SSL_CTX_set_info_callback(
|
|
|
|
SSL_CTX *ctx, void (*cb)(const SSL *ssl, int type, int value)) {
|
2014-12-19 01:42:32 +00:00
|
|
|
ctx->info_callback = cb;
|
|
|
|
}
|
|
|
|
|
|
|
|
void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl, int type,
|
2015-10-18 03:51:17 +01:00
|
|
|
int value) {
|
2014-12-19 01:42:32 +00:00
|
|
|
return ctx->info_callback;
|
|
|
|
}
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
void SSL_CTX_set_channel_id_cb(SSL_CTX *ctx,
|
2014-12-19 01:42:32 +00:00
|
|
|
void (*cb)(SSL *ssl, EVP_PKEY **pkey)) {
|
|
|
|
ctx->channel_id_cb = cb;
|
|
|
|
}
|
|
|
|
|
|
|
|
void (*SSL_CTX_get_channel_id_cb(SSL_CTX *ctx))(SSL *ssl, EVP_PKEY **pkey) {
|
|
|
|
return ctx->channel_id_cb;
|
|
|
|
}
|