7934f08b26
Rather than init_msg/init_num, there is a get_message function which either returns success or try again. This function does not advance the current message (see the previous preparatory change). It only completes the current one if necessary. Being idempotent means it may be freely placed at the top of states which otherwise have other asychronous operations. It also eases converting the TLS 1.2 state machine. See https://docs.google.com/a/google.com/document/d/11n7LHsT3GwE34LAJIe3EFs4165TI4UR_3CqiM9LJVpI/edit?usp=sharing for details. The read_message hook (later to be replaced by something which doesn't depend on BIO) intentionally does not finish the handshake, only "makes progress". A follow-up change will align both TLS and DTLS on consuming one handshake record and always consuming the entire record (so init_buf may contain trailing data). In a few places I've gone ahead and accounted for that case because it was more natural to do so. This change also removes a couple pointers of redundant state from every socket. Bug: 128 Change-Id: I89d8f3622d3b53147d69ee3ac34bb654ed044a71 Reviewed-on: https://boringssl-review.googlesource.com/18806 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
198 lines
6.1 KiB
C++
198 lines
6.1 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"
|
|
|
|
|
|
using namespace bssl;
|
|
|
|
static int dtls1_supports_cipher(const SSL_CIPHER *cipher) {
|
|
return cipher->algorithm_enc != SSL_eNULL;
|
|
}
|
|
|
|
static void dtls1_on_handshake_complete(SSL *ssl) {
|
|
/* If we wrote the last flight, we'll have a timer left over without waiting
|
|
* for a read. Stop the timer but leave the flight around for post-handshake
|
|
* transmission logic. */
|
|
dtls1_stop_timer(ssl);
|
|
}
|
|
|
|
static int dtls1_set_read_state(SSL *ssl, UniquePtr<SSLAEADContext> aead_ctx) {
|
|
/* Cipher changes are illegal when there are buffered incoming messages. */
|
|
if (dtls_has_incoming_messages(ssl) || ssl->d1->has_change_cipher_spec) {
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_BUFFERED_MESSAGES_ON_CIPHER_CHANGE);
|
|
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
|
|
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));
|
|
|
|
Delete(ssl->s3->aead_read_ctx);
|
|
ssl->s3->aead_read_ctx = aead_ctx.release();
|
|
return 1;
|
|
}
|
|
|
|
static int dtls1_set_write_state(SSL *ssl, UniquePtr<SSLAEADContext> 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));
|
|
|
|
Delete(ssl->d1->last_aead_write_ctx);
|
|
ssl->d1->last_aead_write_ctx = ssl->s3->aead_write_ctx;
|
|
ssl->s3->aead_write_ctx = aead_ctx.release();
|
|
return 1;
|
|
}
|
|
|
|
static const SSL_PROTOCOL_METHOD kDTLSProtocolMethod = {
|
|
1 /* is_dtls */,
|
|
dtls1_new,
|
|
dtls1_free,
|
|
dtls1_get_message,
|
|
dtls1_read_message,
|
|
dtls1_next_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_on_handshake_complete,
|
|
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;
|
|
}
|
|
|
|
const SSL_METHOD *DTLS_with_buffers_method(void) {
|
|
static const SSL_METHOD kMethod = {
|
|
0,
|
|
&kDTLSProtocolMethod,
|
|
&ssl_noop_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();
|
|
}
|