daf207a52a
On the TLS side, we introduce a running buffer of ciphertext. Queuing up pending data consists of encrypting the record into the buffer. This effectively reimplements what the buffer BIO was doing previously, but this resizes to fit the whole flight. As part of this, rename all the functions to add to the pending flight to be more uniform. This CL proposes "add_foo" to add to the pending flight and "flush_flight" to drain it. We add an add_alert hook for alerts but, for now, only the SSL 3.0 warning alert (sent mid-handshake) uses this mechanism. Later work will push this down to the rest of the write path so closure alerts use it too, as in DTLS. The intended end state is that all the ssl_buffer.c and wpend_ret logic will only be used for application data and eventually optionally replaced by the in-place API, while all "incidental" data will be handled internally. For now, the two buffers are mutually exclusive. Moving closure alerts to "incidentals" will change this, but flushing application data early is tricky due to wpend_ret. (If we call ssl_write_buffer_flush, do_ssl3_write doesn't realize it still has a wpend_ret to replay.) That too is all left alone in this change. To keep the diff down, write_message is retained for now and will be removed from the state machines in a follow-up change. BUG=72 Change-Id: Ibce882f5f7196880648f25d5005322ca4055c71d Reviewed-on: https://boringssl-review.googlesource.com/13224 Reviewed-by: Adam Langley <agl@google.com>
216 lines
6.5 KiB
C
216 lines
6.5 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_version_from_wire(uint16_t *out_version,
|
|
uint16_t wire_version) {
|
|
switch (wire_version) {
|
|
case DTLS1_VERSION:
|
|
/* DTLS 1.0 maps to TLS 1.1, not TLS 1.0. */
|
|
*out_version = TLS1_1_VERSION;
|
|
return 1;
|
|
case DTLS1_2_VERSION:
|
|
*out_version = TLS1_2_VERSION;
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static uint16_t dtls1_version_to_wire(uint16_t version) {
|
|
switch (version) {
|
|
case TLS1_1_VERSION:
|
|
/* DTLS 1.0 maps to TLS 1.1, not TLS 1.0. */
|
|
return DTLS1_VERSION;
|
|
case TLS1_2_VERSION:
|
|
return DTLS1_2_VERSION;
|
|
}
|
|
|
|
/* It is an error to use this function with an invalid version. */
|
|
assert(0);
|
|
return 0;
|
|
}
|
|
|
|
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 */,
|
|
TLS1_1_VERSION,
|
|
TLS1_2_VERSION,
|
|
dtls1_version_from_wire,
|
|
dtls1_version_to_wire,
|
|
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,
|
|
dtls1_write_message,
|
|
};
|
|
|
|
const SSL_METHOD *DTLS_method(void) {
|
|
static const SSL_METHOD kMethod = {
|
|
0,
|
|
&kDTLSProtocolMethod,
|
|
};
|
|
return &kMethod;
|
|
}
|
|
|
|
/* Legacy version-locked methods. */
|
|
|
|
const SSL_METHOD *DTLSv1_2_method(void) {
|
|
static const SSL_METHOD kMethod = {
|
|
DTLS1_2_VERSION,
|
|
&kDTLSProtocolMethod,
|
|
};
|
|
return &kMethod;
|
|
}
|
|
|
|
const SSL_METHOD *DTLSv1_method(void) {
|
|
static const SSL_METHOD kMethod = {
|
|
DTLS1_VERSION,
|
|
&kDTLSProtocolMethod,
|
|
};
|
|
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();
|
|
}
|