8f36c51f98
This is in preparation for upcoming experiments which will require supporting multiple experimental versions of TLS 1.3 with, on the server, the ability to enable multiple variants at once. This means the version <-> wire bijection no longer exists, even when limiting to a single SSL*. Thus version_to_wire is removed and instead we treat the wire version as the canonical version value. There is a mapping from valid wire versions to protocol versions which describe the high-level handshake protocol in use. This mapping is not injective, so uses of version_from_wire are rewritten differently. All the version-munging logic is moved to ssl_versions.c with a master preference list of all TLS and DTLS versions. The legacy version negotiation is converted to the new scheme. The version lists and negotiation are driven by the preference lists and a ssl_supports_version API. To simplify the mess around SSL_SESSION and versions, version_from_wire is now DTLS/TLS-agnostic, with any filtering being done by ssl_supports_version. This is screwy but allows parsing SSL_SESSIONs to sanity-check it and reject all bogus versions in SSL_SESSION. This reduces a mess of error cases. As part of this, the weird logic where ssl->version is set early when sending the ClientHello is removed. The one place where we were relying on this behavior is tweaked to query hs->max_version instead. Change-Id: Ic91b348481ceba94d9ae06d6781187c11adc15b0 Reviewed-on: https://boringssl-review.googlesource.com/17524 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com>
185 lines
5.8 KiB
C
185 lines
5.8 KiB
C
/*
|
|
* DTLS implementation written by Nagendra Modadugu
|
|
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
|
|
*/
|
|
/* ====================================================================
|
|
* Copyright (c) 1999-2005 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). */
|
|
|
|
#include <openssl/ssl.h>
|
|
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
#include <openssl/buf.h>
|
|
#include <openssl/err.h>
|
|
|
|
#include "../crypto/internal.h"
|
|
#include "internal.h"
|
|
|
|
|
|
static int dtls1_supports_cipher(const SSL_CIPHER *cipher) {
|
|
return cipher->algorithm_enc != SSL_eNULL;
|
|
}
|
|
|
|
static void dtls1_expect_flight(SSL *ssl) { dtls1_start_timer(ssl); }
|
|
|
|
static void dtls1_received_flight(SSL *ssl) { dtls1_stop_timer(ssl); }
|
|
|
|
static int dtls1_set_read_state(SSL *ssl, SSL_AEAD_CTX *aead_ctx) {
|
|
/* Cipher changes are illegal when there are buffered incoming messages. */
|
|
if (dtls_has_incoming_messages(ssl)) {
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_BUFFERED_MESSAGES_ON_CIPHER_CHANGE);
|
|
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
|
|
SSL_AEAD_CTX_free(aead_ctx);
|
|
return 0;
|
|
}
|
|
|
|
ssl->d1->r_epoch++;
|
|
OPENSSL_memset(&ssl->d1->bitmap, 0, sizeof(ssl->d1->bitmap));
|
|
OPENSSL_memset(ssl->s3->read_sequence, 0, sizeof(ssl->s3->read_sequence));
|
|
|
|
SSL_AEAD_CTX_free(ssl->s3->aead_read_ctx);
|
|
ssl->s3->aead_read_ctx = aead_ctx;
|
|
return 1;
|
|
}
|
|
|
|
static int dtls1_set_write_state(SSL *ssl, SSL_AEAD_CTX *aead_ctx) {
|
|
ssl->d1->w_epoch++;
|
|
OPENSSL_memcpy(ssl->d1->last_write_sequence, ssl->s3->write_sequence,
|
|
sizeof(ssl->s3->write_sequence));
|
|
OPENSSL_memset(ssl->s3->write_sequence, 0, sizeof(ssl->s3->write_sequence));
|
|
|
|
SSL_AEAD_CTX_free(ssl->s3->aead_write_ctx);
|
|
ssl->s3->aead_write_ctx = aead_ctx;
|
|
return 1;
|
|
}
|
|
|
|
static const SSL_PROTOCOL_METHOD kDTLSProtocolMethod = {
|
|
1 /* is_dtls */,
|
|
dtls1_new,
|
|
dtls1_free,
|
|
dtls1_get_message,
|
|
dtls1_get_current_message,
|
|
dtls1_release_current_message,
|
|
dtls1_read_app_data,
|
|
dtls1_read_change_cipher_spec,
|
|
dtls1_read_close_notify,
|
|
dtls1_write_app_data,
|
|
dtls1_dispatch_alert,
|
|
dtls1_supports_cipher,
|
|
dtls1_init_message,
|
|
dtls1_finish_message,
|
|
dtls1_add_message,
|
|
dtls1_add_change_cipher_spec,
|
|
dtls1_add_alert,
|
|
dtls1_flush_flight,
|
|
dtls1_expect_flight,
|
|
dtls1_received_flight,
|
|
dtls1_set_read_state,
|
|
dtls1_set_write_state,
|
|
};
|
|
|
|
const SSL_METHOD *DTLS_method(void) {
|
|
static const SSL_METHOD kMethod = {
|
|
0,
|
|
&kDTLSProtocolMethod,
|
|
&ssl_crypto_x509_method,
|
|
};
|
|
return &kMethod;
|
|
}
|
|
|
|
/* Legacy version-locked methods. */
|
|
|
|
const SSL_METHOD *DTLSv1_2_method(void) {
|
|
static const SSL_METHOD kMethod = {
|
|
DTLS1_2_VERSION,
|
|
&kDTLSProtocolMethod,
|
|
&ssl_crypto_x509_method,
|
|
};
|
|
return &kMethod;
|
|
}
|
|
|
|
const SSL_METHOD *DTLSv1_method(void) {
|
|
static const SSL_METHOD kMethod = {
|
|
DTLS1_VERSION,
|
|
&kDTLSProtocolMethod,
|
|
&ssl_crypto_x509_method,
|
|
};
|
|
return &kMethod;
|
|
}
|
|
|
|
/* Legacy side-specific methods. */
|
|
|
|
const SSL_METHOD *DTLSv1_2_server_method(void) {
|
|
return DTLSv1_2_method();
|
|
}
|
|
|
|
const SSL_METHOD *DTLSv1_server_method(void) {
|
|
return DTLSv1_method();
|
|
}
|
|
|
|
const SSL_METHOD *DTLSv1_2_client_method(void) {
|
|
return DTLSv1_2_method();
|
|
}
|
|
|
|
const SSL_METHOD *DTLSv1_client_method(void) {
|
|
return DTLSv1_method();
|
|
}
|
|
|
|
const SSL_METHOD *DTLS_server_method(void) {
|
|
return DTLS_method();
|
|
}
|
|
|
|
const SSL_METHOD *DTLS_client_method(void) {
|
|
return DTLS_method();
|
|
}
|