2014-06-20 20:00:00 +01:00
|
|
|
/*
|
|
|
|
* DTLS implementation written by Nagendra Modadugu
|
|
|
|
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 1998-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).
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
/* 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.] */
|
|
|
|
|
2015-09-15 06:48:04 +01:00
|
|
|
#include <openssl/ssl.h>
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
#include <assert.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include <openssl/buf.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/mem.h>
|
|
|
|
#include <openssl/rand.h>
|
|
|
|
#include <openssl/x509.h>
|
|
|
|
|
2015-04-08 03:38:30 +01:00
|
|
|
#include "internal.h"
|
2014-06-20 20:00:00 +01:00
|
|
|
|
|
|
|
|
2015-01-12 00:31:22 +00:00
|
|
|
/* TODO(davidben): 28 comes from the size of IP + UDP header. Is this reasonable
|
|
|
|
* for these values? Notably, why is kMinMTU a function of the transport
|
|
|
|
* protocol's overhead rather than, say, what's needed to hold a minimally-sized
|
|
|
|
* handshake fragment plus protocol overhead. */
|
|
|
|
|
|
|
|
/* kMinMTU is the minimum acceptable MTU value. */
|
|
|
|
static const unsigned int kMinMTU = 256 - 28;
|
|
|
|
|
|
|
|
/* kDefaultMTU is the default MTU value to use if neither the user nor
|
|
|
|
* the underlying BIO supplies one. */
|
|
|
|
static const unsigned int kDefaultMTU = 1500 - 28;
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* kMaxHandshakeBuffer is the maximum number of handshake messages ahead of the
|
|
|
|
* current one to buffer. */
|
|
|
|
static const unsigned int kHandshakeBufferSize = 10;
|
|
|
|
|
2015-09-12 23:21:35 +01:00
|
|
|
static hm_fragment *dtls1_hm_fragment_new(size_t frag_len, int reassembly) {
|
|
|
|
hm_fragment *frag = OPENSSL_malloc(sizeof(hm_fragment));
|
2014-12-14 00:28:18 +00:00
|
|
|
if (frag == NULL) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
|
2014-12-14 00:28:18 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2015-09-12 23:21:35 +01:00
|
|
|
memset(frag, 0, sizeof(hm_fragment));
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-09-12 23:21:35 +01:00
|
|
|
/* If the handshake message is empty, |frag->fragment| and |frag->reassembly|
|
|
|
|
* are NULL. */
|
|
|
|
if (frag_len > 0) {
|
|
|
|
frag->fragment = OPENSSL_malloc(frag_len);
|
|
|
|
if (frag->fragment == NULL) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
|
2015-09-12 23:21:35 +01:00
|
|
|
goto err;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-09-12 23:21:35 +01:00
|
|
|
if (reassembly) {
|
|
|
|
/* Initialize reassembly bitmask. */
|
|
|
|
if (frag_len + 7 < frag_len) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_OVERFLOW);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
size_t bitmask_len = (frag_len + 7) / 8;
|
|
|
|
frag->reassembly = OPENSSL_malloc(bitmask_len);
|
|
|
|
if (frag->reassembly == NULL) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
|
|
|
|
goto err;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-09-12 23:21:35 +01:00
|
|
|
memset(frag->reassembly, 0, bitmask_len);
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return frag;
|
2015-09-12 23:21:35 +01:00
|
|
|
|
|
|
|
err:
|
|
|
|
dtls1_hm_fragment_free(frag);
|
|
|
|
return NULL;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void dtls1_hm_fragment_free(hm_fragment *frag) {
|
2015-04-22 18:38:00 +01:00
|
|
|
if (frag == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
2015-04-22 21:17:58 +01:00
|
|
|
OPENSSL_free(frag->fragment);
|
|
|
|
OPENSSL_free(frag->reassembly);
|
2014-12-14 00:28:18 +00:00
|
|
|
OPENSSL_free(frag);
|
|
|
|
}
|
|
|
|
|
2015-03-03 01:52:52 +00:00
|
|
|
#if !defined(inline)
|
|
|
|
#define inline __inline
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* bit_range returns a |uint8_t| with bits |start|, inclusive, to |end|,
|
|
|
|
* exclusive, set. */
|
|
|
|
static inline uint8_t bit_range(size_t start, size_t end) {
|
|
|
|
return (uint8_t)(~((1u << start) - 1) & ((1u << end) - 1));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* dtls1_hm_fragment_mark marks bytes |start|, inclusive, to |end|, exclusive,
|
|
|
|
* as received in |frag|. If |frag| becomes complete, it clears
|
|
|
|
* |frag->reassembly|. The range must be within the bounds of |frag|'s message
|
|
|
|
* and |frag->reassembly| must not be NULL. */
|
|
|
|
static void dtls1_hm_fragment_mark(hm_fragment *frag, size_t start,
|
|
|
|
size_t end) {
|
|
|
|
size_t i;
|
|
|
|
size_t msg_len = frag->msg_header.msg_len;
|
|
|
|
|
|
|
|
if (frag->reassembly == NULL || start > end || end > msg_len) {
|
|
|
|
assert(0);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* A zero-length message will never have a pending reassembly. */
|
|
|
|
assert(msg_len > 0);
|
|
|
|
|
|
|
|
if ((start >> 3) == (end >> 3)) {
|
|
|
|
frag->reassembly[start >> 3] |= bit_range(start & 7, end & 7);
|
|
|
|
} else {
|
|
|
|
frag->reassembly[start >> 3] |= bit_range(start & 7, 8);
|
|
|
|
for (i = (start >> 3) + 1; i < (end >> 3); i++) {
|
|
|
|
frag->reassembly[i] = 0xff;
|
|
|
|
}
|
|
|
|
if ((end & 7) != 0) {
|
|
|
|
frag->reassembly[end >> 3] |= bit_range(0, end & 7);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if the fragment is complete. */
|
|
|
|
for (i = 0; i < (msg_len >> 3); i++) {
|
|
|
|
if (frag->reassembly[i] != 0xff) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((msg_len & 7) != 0 &&
|
|
|
|
frag->reassembly[msg_len >> 3] != bit_range(0, msg_len & 7)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
OPENSSL_free(frag->reassembly);
|
|
|
|
frag->reassembly = NULL;
|
|
|
|
}
|
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
static void dtls1_update_mtu(SSL *ssl) {
|
|
|
|
/* TODO(davidben): What is this code doing and do we need it? */
|
|
|
|
if (ssl->d1->mtu < dtls1_min_mtu() &&
|
|
|
|
!(SSL_get_options(ssl) & SSL_OP_NO_QUERY_MTU)) {
|
2016-05-20 19:27:17 +01:00
|
|
|
long mtu = BIO_ctrl(ssl->wbio, BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
|
2015-01-12 00:36:58 +00:00
|
|
|
if (mtu >= 0 && mtu <= (1 << 30) && (unsigned)mtu >= dtls1_min_mtu()) {
|
2015-11-03 19:54:39 +00:00
|
|
|
ssl->d1->mtu = (unsigned)mtu;
|
2015-01-12 00:36:58 +00:00
|
|
|
} else {
|
2015-11-03 19:54:39 +00:00
|
|
|
ssl->d1->mtu = kDefaultMTU;
|
2016-05-20 19:27:17 +01:00
|
|
|
BIO_ctrl(ssl->wbio, BIO_CTRL_DGRAM_SET_MTU, ssl->d1->mtu, NULL);
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
/* The MTU should be above the minimum now. */
|
|
|
|
assert(ssl->d1->mtu >= dtls1_min_mtu());
|
|
|
|
}
|
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
/* dtls1_max_record_size returns the maximum record body length that may be
|
|
|
|
* written without exceeding the MTU. It accounts for any buffering installed on
|
|
|
|
* the write BIO. If no record may be written, it returns zero. */
|
|
|
|
static size_t dtls1_max_record_size(SSL *ssl) {
|
|
|
|
size_t ret = ssl->d1->mtu;
|
|
|
|
|
|
|
|
size_t overhead = ssl_max_seal_overhead(ssl);
|
|
|
|
if (ret <= overhead) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
ret -= overhead;
|
|
|
|
|
2016-05-20 19:27:17 +01:00
|
|
|
size_t pending = BIO_wpending(ssl->wbio);
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
if (ret <= pending) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
ret -= pending;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
static int dtls1_write_change_cipher_spec(SSL *ssl,
|
|
|
|
enum dtls1_use_epoch_t use_epoch) {
|
|
|
|
dtls1_update_mtu(ssl);
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
/* During the handshake, wbio is buffered to pack messages together. Flush the
|
|
|
|
* buffer if the ChangeCipherSpec would not fit in a packet. */
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
if (dtls1_max_record_size(ssl) == 0) {
|
2016-05-20 19:27:17 +01:00
|
|
|
int ret = BIO_flush(ssl->wbio);
|
2015-11-03 19:54:39 +00:00
|
|
|
if (ret <= 0) {
|
2016-03-12 03:56:19 +00:00
|
|
|
ssl->rwstate = SSL_WRITING;
|
2015-11-03 19:54:39 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const uint8_t kChangeCipherSpec[1] = {SSL3_MT_CCS};
|
2015-12-19 22:05:56 +00:00
|
|
|
int ret =
|
|
|
|
dtls1_write_bytes(ssl, SSL3_RT_CHANGE_CIPHER_SPEC, kChangeCipherSpec,
|
|
|
|
sizeof(kChangeCipherSpec), use_epoch);
|
2015-11-03 19:54:39 +00:00
|
|
|
if (ret <= 0) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ssl->msg_callback != NULL) {
|
|
|
|
ssl->msg_callback(1 /* write */, ssl->version, SSL3_RT_CHANGE_CIPHER_SPEC,
|
|
|
|
kChangeCipherSpec, sizeof(kChangeCipherSpec), ssl,
|
|
|
|
ssl->msg_callback_arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
int dtls1_do_handshake_write(SSL *ssl, enum dtls1_use_epoch_t use_epoch) {
|
|
|
|
dtls1_update_mtu(ssl);
|
|
|
|
|
|
|
|
int ret = -1;
|
|
|
|
CBB cbb;
|
|
|
|
CBB_zero(&cbb);
|
|
|
|
/* Allocate a temporary buffer to hold the message fragments to avoid
|
|
|
|
* clobbering the message. */
|
|
|
|
uint8_t *buf = OPENSSL_malloc(ssl->d1->mtu);
|
|
|
|
if (buf == NULL) {
|
|
|
|
goto err;
|
|
|
|
}
|
2014-12-14 00:28:18 +00:00
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
/* Consume the message header. Fragments will have different headers
|
|
|
|
* prepended. */
|
|
|
|
if (ssl->init_off == 0) {
|
|
|
|
ssl->init_off += DTLS1_HM_HEADER_LENGTH;
|
|
|
|
ssl->init_num -= DTLS1_HM_HEADER_LENGTH;
|
|
|
|
}
|
|
|
|
assert(ssl->init_off >= DTLS1_HM_HEADER_LENGTH);
|
|
|
|
|
|
|
|
do {
|
|
|
|
/* During the handshake, wbio is buffered to pack messages together. Flush
|
|
|
|
* the buffer if there isn't enough room to make progress. */
|
|
|
|
if (dtls1_max_record_size(ssl) < DTLS1_HM_HEADER_LENGTH + 1) {
|
2016-05-20 19:27:17 +01:00
|
|
|
int flush_ret = BIO_flush(ssl->wbio);
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
if (flush_ret <= 0) {
|
2016-03-12 03:56:19 +00:00
|
|
|
ssl->rwstate = SSL_WRITING;
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
ret = flush_ret;
|
|
|
|
goto err;
|
|
|
|
}
|
2016-05-20 19:27:17 +01:00
|
|
|
assert(BIO_wpending(ssl->wbio) == 0);
|
2015-11-03 19:54:39 +00:00
|
|
|
}
|
2014-12-14 00:28:18 +00:00
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
size_t todo = dtls1_max_record_size(ssl);
|
|
|
|
if (todo < DTLS1_HM_HEADER_LENGTH + 1) {
|
2015-11-03 19:54:39 +00:00
|
|
|
/* To make forward progress, the MTU must, at minimum, fit the handshake
|
|
|
|
* header and one byte of handshake body. */
|
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_MTU_TOO_SMALL);
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
goto err;
|
2015-11-03 19:54:39 +00:00
|
|
|
}
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
todo -= DTLS1_HM_HEADER_LENGTH;
|
2014-12-14 00:28:18 +00:00
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
if (todo > (size_t)ssl->init_num) {
|
|
|
|
todo = ssl->init_num;
|
|
|
|
}
|
|
|
|
if (todo >= (1u << 24)) {
|
|
|
|
todo = (1u << 24) - 1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
size_t len;
|
|
|
|
if (!CBB_init_fixed(&cbb, buf, ssl->d1->mtu) ||
|
|
|
|
!CBB_add_u8(&cbb, ssl->d1->w_msg_hdr.type) ||
|
|
|
|
!CBB_add_u24(&cbb, ssl->d1->w_msg_hdr.msg_len) ||
|
|
|
|
!CBB_add_u16(&cbb, ssl->d1->w_msg_hdr.seq) ||
|
|
|
|
!CBB_add_u24(&cbb, ssl->init_off - DTLS1_HM_HEADER_LENGTH) ||
|
|
|
|
!CBB_add_u24(&cbb, todo) ||
|
|
|
|
!CBB_add_bytes(
|
|
|
|
&cbb, (const uint8_t *)ssl->init_buf->data + ssl->init_off, todo) ||
|
|
|
|
!CBB_finish(&cbb, NULL, &len)) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
|
|
|
|
goto err;
|
|
|
|
}
|
2015-11-03 19:54:39 +00:00
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
int write_ret = dtls1_write_bytes(ssl, SSL3_RT_HANDSHAKE, buf, len,
|
|
|
|
use_epoch);
|
|
|
|
if (write_ret <= 0) {
|
|
|
|
ret = write_ret;
|
|
|
|
goto err;
|
2015-01-12 00:25:32 +00:00
|
|
|
}
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
ssl->init_off += todo;
|
|
|
|
ssl->init_num -= todo;
|
|
|
|
} while (ssl->init_num > 0);
|
2014-12-14 00:28:18 +00:00
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
if (ssl->msg_callback != NULL) {
|
|
|
|
ssl->msg_callback(
|
|
|
|
1 /* write */, ssl->version, SSL3_RT_HANDSHAKE, ssl->init_buf->data,
|
|
|
|
(size_t)(ssl->init_off + ssl->init_num), ssl, ssl->msg_callback_arg);
|
|
|
|
}
|
2015-01-12 00:25:32 +00:00
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
ssl->init_off = 0;
|
|
|
|
ssl->init_num = 0;
|
2015-01-12 00:25:32 +00:00
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
ret = 1;
|
2014-12-14 00:28:18 +00:00
|
|
|
|
Rewrite DTLS handshake message sending logic.
This fixes a number of bugs with the original logic:
- If handshake messages are fragmented and writes need to be retried, frag_off
gets completely confused.
- The BIO_flush call didn't set rwstate, so it wasn't resumable at that point.
- The msg_callback call gets garbage because the fragment header would get
scribbled over the handshake buffer.
The original logic was also extremely confusing with how it handles init_off.
(init_off gets rewound to make room for the fragment header. Depending on
where you pause, resuming may or may not have already been rewound.)
For simplicity, just allocate a new buffer to assemble the fragment in and
avoid clobbering the old one. I don't think it's worth the complexity to
optimize that. If we want to optimize this sort of thing, not clobbering seems
better anyway because the message may need to be retransmitted. We could avoid
doing a copy when buffering the outgoing message for retransmission later.
We do still need to track how far we are in sending the current message via
init_off, so I haven't opted to disconnect this function from
init_{buf,off,num} yet.
Test the fix to the retry + fragment case by having the splitHandshake option
to the state machine tests, in DTLS, also clamp the MTU to force handshake
fragmentation.
Change-Id: I66f634d6c752ea63649db8ed2f898f9cc2b13908
Reviewed-on: https://boringssl-review.googlesource.com/6421
Reviewed-by: Adam Langley <agl@google.com>
2015-11-03 20:39:45 +00:00
|
|
|
err:
|
|
|
|
CBB_cleanup(&cbb);
|
|
|
|
OPENSSL_free(buf);
|
|
|
|
return ret;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* dtls1_is_next_message_complete returns one if the next handshake message is
|
|
|
|
* complete and zero otherwise. */
|
2015-12-19 22:05:56 +00:00
|
|
|
static int dtls1_is_next_message_complete(SSL *ssl) {
|
|
|
|
pitem *item = pqueue_peek(ssl->d1->buffered_messages);
|
2015-03-03 00:30:30 +00:00
|
|
|
if (item == NULL) {
|
|
|
|
return 0;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
hm_fragment *frag = (hm_fragment *)item->data;
|
2015-12-19 22:05:56 +00:00
|
|
|
assert(ssl->d1->handshake_read_seq <= frag->msg_header.seq);
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
return ssl->d1->handshake_read_seq == frag->msg_header.seq &&
|
|
|
|
frag->reassembly == NULL;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* dtls1_discard_fragment_body discards a handshake fragment body of length
|
|
|
|
* |frag_len|. It returns one on success and zero on error.
|
|
|
|
*
|
|
|
|
* TODO(davidben): This function will go away when ssl_read_bytes is gone from
|
|
|
|
* the DTLS side. */
|
2015-12-19 22:05:56 +00:00
|
|
|
static int dtls1_discard_fragment_body(SSL *ssl, size_t frag_len) {
|
2015-03-03 00:30:30 +00:00
|
|
|
uint8_t discard[256];
|
|
|
|
while (frag_len > 0) {
|
|
|
|
size_t chunk = frag_len < sizeof(discard) ? frag_len : sizeof(discard);
|
2015-12-19 22:05:56 +00:00
|
|
|
int ret = dtls1_read_bytes(ssl, SSL3_RT_HANDSHAKE, discard, chunk, 0);
|
2015-06-02 22:16:44 +01:00
|
|
|
if (ret != (int) chunk) {
|
2015-03-03 00:30:30 +00:00
|
|
|
return 0;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 00:30:30 +00:00
|
|
|
frag_len -= chunk;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 00:30:30 +00:00
|
|
|
return 1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* dtls1_get_buffered_message returns the buffered message corresponding to
|
|
|
|
* |msg_hdr|. If none exists, it creates a new one and inserts it in the
|
|
|
|
* queue. Otherwise, it checks |msg_hdr| is consistent with the existing one. It
|
|
|
|
* returns NULL on failure. The caller does not take ownership of the result. */
|
|
|
|
static hm_fragment *dtls1_get_buffered_message(
|
2015-12-19 22:05:56 +00:00
|
|
|
SSL *ssl, const struct hm_header_st *msg_hdr) {
|
2015-03-03 00:30:30 +00:00
|
|
|
uint8_t seq64be[8];
|
|
|
|
memset(seq64be, 0, sizeof(seq64be));
|
|
|
|
seq64be[6] = (uint8_t)(msg_hdr->seq >> 8);
|
|
|
|
seq64be[7] = (uint8_t)msg_hdr->seq;
|
2015-12-19 22:05:56 +00:00
|
|
|
pitem *item = pqueue_find(ssl->d1->buffered_messages, seq64be);
|
2014-12-14 00:28:18 +00:00
|
|
|
|
|
|
|
hm_fragment *frag;
|
|
|
|
if (item == NULL) {
|
2015-03-03 00:30:30 +00:00
|
|
|
/* This is the first fragment from this message. */
|
|
|
|
frag = dtls1_hm_fragment_new(msg_hdr->msg_len,
|
|
|
|
1 /* reassembly buffer needed */);
|
|
|
|
if (frag == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
memcpy(&frag->msg_header, msg_hdr, sizeof(*msg_hdr));
|
|
|
|
item = pitem_new(seq64be, frag);
|
|
|
|
if (item == NULL) {
|
|
|
|
dtls1_hm_fragment_free(frag);
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-12-19 22:05:56 +00:00
|
|
|
item = pqueue_insert(ssl->d1->buffered_messages, item);
|
2015-03-03 00:30:30 +00:00
|
|
|
/* |pqueue_insert| fails iff a duplicate item is inserted, but |item| cannot
|
|
|
|
* be a duplicate. */
|
|
|
|
assert(item != NULL);
|
|
|
|
} else {
|
|
|
|
frag = item->data;
|
|
|
|
assert(frag->msg_header.seq == msg_hdr->seq);
|
|
|
|
if (frag->msg_header.type != msg_hdr->type ||
|
|
|
|
frag->msg_header.msg_len != msg_hdr->msg_len) {
|
|
|
|
/* The new fragment must be compatible with the previous fragments from
|
|
|
|
* this message. */
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_FRAGMENT_MISMATCH);
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
2015-03-03 00:30:30 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 00:30:30 +00:00
|
|
|
return frag;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* dtls1_process_fragment reads a handshake fragment and processes it. It
|
|
|
|
* returns one if a fragment was successfully processed and 0 or -1 on error. */
|
2015-12-19 22:05:56 +00:00
|
|
|
static int dtls1_process_fragment(SSL *ssl) {
|
2015-06-16 16:40:24 +01:00
|
|
|
/* Read handshake message header. */
|
2015-03-03 00:30:30 +00:00
|
|
|
uint8_t header[DTLS1_HM_HEADER_LENGTH];
|
2015-12-19 22:05:56 +00:00
|
|
|
int ret = dtls1_read_bytes(ssl, SSL3_RT_HANDSHAKE, header,
|
2015-05-30 21:22:10 +01:00
|
|
|
DTLS1_HM_HEADER_LENGTH, 0);
|
2015-03-03 00:30:30 +00:00
|
|
|
if (ret <= 0) {
|
|
|
|
return ret;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 00:30:30 +00:00
|
|
|
if (ret != DTLS1_HM_HEADER_LENGTH) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_MESSAGE);
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_UNEXPECTED_MESSAGE);
|
2015-03-03 00:30:30 +00:00
|
|
|
return -1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* Parse the message fragment header. */
|
|
|
|
struct hm_header_st msg_hdr;
|
|
|
|
dtls1_get_message_header(header, &msg_hdr);
|
|
|
|
|
2015-06-16 16:40:24 +01:00
|
|
|
/* TODO(davidben): dtls1_read_bytes is the wrong abstraction for DTLS. There
|
2015-12-19 22:05:56 +00:00
|
|
|
* should be no need to reach into |ssl->s3->rrec.length|. */
|
2015-03-03 00:30:30 +00:00
|
|
|
const size_t frag_off = msg_hdr.frag_off;
|
|
|
|
const size_t frag_len = msg_hdr.frag_len;
|
|
|
|
const size_t msg_len = msg_hdr.msg_len;
|
|
|
|
if (frag_off > msg_len || frag_off + frag_len < frag_off ||
|
|
|
|
frag_off + frag_len > msg_len ||
|
Simplify handshake message size limits.
A handshake message can go up to 2^24 bytes = 16MB which is a little large for
the peer to force us to buffer. Accordingly, we bound the size of a
handshake message.
Rather than have a global limit, the existing logic uses a different limit at
each state in the handshake state machine and, for certificates, allows
configuring the maximum certificate size. This is nice in that we engage larger
limits iff the relevant state is reachable from the handshake. Servers without
client auth get a tighter limit "for free".
However, this doesn't work for DTLS due to out-of-order messages and we use a
simpler scheme for DTLS. This scheme also is tricky on optional messages and
makes the handshake <-> message layer communication complex.
Apart from an ignored 20,000 byte limit on ServerHello, the largest
non-certificate limit is the common 16k limit on ClientHello. So this
complexity wasn't buying us anything. Unify everything on the DTLS scheme
except, so as not to regress bounds on client-auth-less servers, also correctly
check for whether client auth is configured. The value of 16k was chosen based
on this value.
(The 20,000 byte ServerHello limit makes no sense. We can easily bound the
ServerHello because servers may not send extensions we don't implement. But it
gets overshadowed by the certificate anyway.)
Change-Id: I00309b16d809a3c2a1543f99fd29c4163e3add81
Reviewed-on: https://boringssl-review.googlesource.com/7941
Reviewed-by: David Benjamin <davidben@google.com>
2016-05-12 05:43:05 +01:00
|
|
|
msg_len > ssl_max_handshake_message_len(ssl) ||
|
2015-12-19 22:05:56 +00:00
|
|
|
frag_len > ssl->s3->rrec.length) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_EXCESSIVE_MESSAGE_SIZE);
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
|
2015-03-03 00:30:30 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
if (msg_hdr.seq < ssl->d1->handshake_read_seq ||
|
|
|
|
msg_hdr.seq > (unsigned)ssl->d1->handshake_read_seq +
|
2015-03-03 00:30:30 +00:00
|
|
|
kHandshakeBufferSize) {
|
|
|
|
/* Ignore fragments from the past, or ones too far in the future. */
|
2015-12-19 22:05:56 +00:00
|
|
|
if (!dtls1_discard_fragment_body(ssl, frag_len)) {
|
2015-03-03 00:30:30 +00:00
|
|
|
return -1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 00:30:30 +00:00
|
|
|
return 1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
hm_fragment *frag = dtls1_get_buffered_message(ssl, &msg_hdr);
|
2015-03-03 00:30:30 +00:00
|
|
|
if (frag == NULL) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
assert(frag->msg_header.msg_len == msg_len);
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
if (frag->reassembly == NULL) {
|
|
|
|
/* The message is already assembled. */
|
2015-12-19 22:05:56 +00:00
|
|
|
if (!dtls1_discard_fragment_body(ssl, frag_len)) {
|
2015-03-03 00:30:30 +00:00
|
|
|
return -1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 00:30:30 +00:00
|
|
|
return 1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 00:30:30 +00:00
|
|
|
assert(msg_len > 0);
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* Read the body of the fragment. */
|
2015-12-19 22:05:56 +00:00
|
|
|
ret = dtls1_read_bytes(ssl, SSL3_RT_HANDSHAKE, frag->fragment + frag_off,
|
2015-05-30 21:22:10 +01:00
|
|
|
frag_len, 0);
|
2015-06-02 22:16:44 +01:00
|
|
|
if (ret != (int) frag_len) {
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl3_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR);
|
2015-03-03 00:30:30 +00:00
|
|
|
return -1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 01:52:52 +00:00
|
|
|
dtls1_hm_fragment_mark(frag, frag_off, frag_off + frag_len);
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
return 1;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* dtls1_get_message reads a handshake message of message type |msg_type| (any
|
Simplify handshake message size limits.
A handshake message can go up to 2^24 bytes = 16MB which is a little large for
the peer to force us to buffer. Accordingly, we bound the size of a
handshake message.
Rather than have a global limit, the existing logic uses a different limit at
each state in the handshake state machine and, for certificates, allows
configuring the maximum certificate size. This is nice in that we engage larger
limits iff the relevant state is reachable from the handshake. Servers without
client auth get a tighter limit "for free".
However, this doesn't work for DTLS due to out-of-order messages and we use a
simpler scheme for DTLS. This scheme also is tricky on optional messages and
makes the handshake <-> message layer communication complex.
Apart from an ignored 20,000 byte limit on ServerHello, the largest
non-certificate limit is the common 16k limit on ClientHello. So this
complexity wasn't buying us anything. Unify everything on the DTLS scheme
except, so as not to regress bounds on client-auth-less servers, also correctly
check for whether client auth is configured. The value of 16k was chosen based
on this value.
(The 20,000 byte ServerHello limit makes no sense. We can easily bound the
ServerHello because servers may not send extensions we don't implement. But it
gets overshadowed by the certificate anyway.)
Change-Id: I00309b16d809a3c2a1543f99fd29c4163e3add81
Reviewed-on: https://boringssl-review.googlesource.com/7941
Reviewed-by: David Benjamin <davidben@google.com>
2016-05-12 05:43:05 +01:00
|
|
|
* if |msg_type| == -1). Read an entire handshake message. Handshake messages
|
|
|
|
* arrive in fragments. */
|
2016-05-13 23:28:17 +01:00
|
|
|
long dtls1_get_message(SSL *ssl, int msg_type,
|
2015-03-03 00:30:30 +00:00
|
|
|
enum ssl_hash_message_t hash_message, int *ok) {
|
2014-12-14 00:28:18 +00:00
|
|
|
pitem *item = NULL;
|
2015-03-03 00:30:30 +00:00
|
|
|
hm_fragment *frag = NULL;
|
|
|
|
int al;
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* s3->tmp is used to store messages that are unexpected, caused
|
|
|
|
* by the absence of an optional handshake message */
|
2015-12-19 22:05:56 +00:00
|
|
|
if (ssl->s3->tmp.reuse_message) {
|
2015-03-03 00:30:30 +00:00
|
|
|
/* A ssl_dont_hash_message call cannot be combined with reuse_message; the
|
|
|
|
* ssl_dont_hash_message would have to have been applied to the previous
|
|
|
|
* call. */
|
|
|
|
assert(hash_message == ssl_hash_message);
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl->s3->tmp.reuse_message = 0;
|
|
|
|
if (msg_type >= 0 && ssl->s3->tmp.message_type != msg_type) {
|
2015-03-03 00:30:30 +00:00
|
|
|
al = SSL_AD_UNEXPECTED_MESSAGE;
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_MESSAGE);
|
2015-03-03 00:30:30 +00:00
|
|
|
goto f_err;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-03-03 00:30:30 +00:00
|
|
|
*ok = 1;
|
2016-05-13 23:12:19 +01:00
|
|
|
assert(ssl->init_buf->length >= DTLS1_HM_HEADER_LENGTH);
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl->init_msg = (uint8_t *)ssl->init_buf->data + DTLS1_HM_HEADER_LENGTH;
|
2016-05-13 23:12:19 +01:00
|
|
|
ssl->init_num = (int)ssl->init_buf->length - DTLS1_HM_HEADER_LENGTH;
|
2015-12-19 22:05:56 +00:00
|
|
|
return ssl->init_num;
|
2015-03-03 00:30:30 +00:00
|
|
|
}
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* Process fragments until one is found. */
|
2015-12-19 22:05:56 +00:00
|
|
|
while (!dtls1_is_next_message_complete(ssl)) {
|
|
|
|
int ret = dtls1_process_fragment(ssl);
|
2015-03-03 00:30:30 +00:00
|
|
|
if (ret <= 0) {
|
|
|
|
*ok = 0;
|
|
|
|
return ret;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* Read out the next complete handshake message. */
|
2015-12-19 22:05:56 +00:00
|
|
|
item = pqueue_pop(ssl->d1->buffered_messages);
|
2015-03-03 00:30:30 +00:00
|
|
|
assert(item != NULL);
|
|
|
|
frag = (hm_fragment *)item->data;
|
2015-12-19 22:05:56 +00:00
|
|
|
assert(ssl->d1->handshake_read_seq == frag->msg_header.seq);
|
2015-03-03 00:30:30 +00:00
|
|
|
assert(frag->reassembly == NULL);
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-06-28 06:26:10 +01:00
|
|
|
/* Reconstruct the assembled message. */
|
2015-03-03 00:30:30 +00:00
|
|
|
CBB cbb;
|
2015-06-28 06:26:10 +01:00
|
|
|
CBB_zero(&cbb);
|
2016-05-13 23:12:19 +01:00
|
|
|
if (!BUF_MEM_reserve(ssl->init_buf, (size_t)frag->msg_header.msg_len +
|
|
|
|
DTLS1_HM_HEADER_LENGTH) ||
|
2015-12-19 22:05:56 +00:00
|
|
|
!CBB_init_fixed(&cbb, (uint8_t *)ssl->init_buf->data,
|
|
|
|
ssl->init_buf->max) ||
|
2015-06-28 06:26:10 +01:00
|
|
|
!CBB_add_u8(&cbb, frag->msg_header.type) ||
|
2015-03-03 00:30:30 +00:00
|
|
|
!CBB_add_u24(&cbb, frag->msg_header.msg_len) ||
|
|
|
|
!CBB_add_u16(&cbb, frag->msg_header.seq) ||
|
|
|
|
!CBB_add_u24(&cbb, 0 /* frag_off */) ||
|
|
|
|
!CBB_add_u24(&cbb, frag->msg_header.msg_len) ||
|
|
|
|
!CBB_add_bytes(&cbb, frag->fragment, frag->msg_header.msg_len) ||
|
2016-05-13 23:12:19 +01:00
|
|
|
!CBB_finish(&cbb, NULL, &ssl->init_buf->length)) {
|
2015-03-03 00:30:30 +00:00
|
|
|
CBB_cleanup(&cbb);
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
|
2015-03-03 00:30:30 +00:00
|
|
|
goto err;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2016-05-13 23:12:19 +01:00
|
|
|
assert(ssl->init_buf->length ==
|
|
|
|
(size_t)frag->msg_header.msg_len + DTLS1_HM_HEADER_LENGTH);
|
2015-03-03 00:30:30 +00:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl->d1->handshake_read_seq++;
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
/* TODO(davidben): This function has a lot of implicit outputs. Simplify the
|
|
|
|
* |ssl_get_message| API. */
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl->s3->tmp.message_type = frag->msg_header.type;
|
|
|
|
ssl->init_msg = (uint8_t *)ssl->init_buf->data + DTLS1_HM_HEADER_LENGTH;
|
|
|
|
ssl->init_num = frag->msg_header.msg_len;
|
2015-03-03 00:30:30 +00:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
if (msg_type >= 0 && ssl->s3->tmp.message_type != msg_type) {
|
2014-12-14 00:28:18 +00:00
|
|
|
al = SSL_AD_UNEXPECTED_MESSAGE;
|
2015-06-29 05:28:17 +01:00
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_MESSAGE);
|
2014-12-14 00:28:18 +00:00
|
|
|
goto f_err;
|
|
|
|
}
|
2015-12-19 22:05:56 +00:00
|
|
|
if (hash_message == ssl_hash_message && !ssl3_hash_current_message(ssl)) {
|
2015-03-03 00:30:30 +00:00
|
|
|
goto err;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
2015-12-19 22:05:56 +00:00
|
|
|
if (ssl->msg_callback) {
|
|
|
|
ssl->msg_callback(0, ssl->version, SSL3_RT_HANDSHAKE, ssl->init_buf->data,
|
|
|
|
ssl->init_num + DTLS1_HM_HEADER_LENGTH, ssl,
|
|
|
|
ssl->msg_callback_arg);
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 00:30:30 +00:00
|
|
|
pitem_free(item);
|
|
|
|
dtls1_hm_fragment_free(frag);
|
2014-12-14 00:28:18 +00:00
|
|
|
|
|
|
|
*ok = 1;
|
2015-12-19 22:05:56 +00:00
|
|
|
return ssl->init_num;
|
2014-06-20 20:00:00 +01:00
|
|
|
|
|
|
|
f_err:
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl3_send_alert(ssl, SSL3_AL_FATAL, al);
|
2015-03-03 00:30:30 +00:00
|
|
|
err:
|
2015-04-22 21:17:58 +01:00
|
|
|
pitem_free(item);
|
|
|
|
dtls1_hm_fragment_free(frag);
|
2014-12-14 00:28:18 +00:00
|
|
|
*ok = 0;
|
|
|
|
return -1;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
int dtls1_read_failed(SSL *ssl, int code) {
|
2014-12-14 00:28:18 +00:00
|
|
|
if (code > 0) {
|
2015-02-13 22:56:28 +00:00
|
|
|
assert(0);
|
2014-12-14 00:28:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
if (!dtls1_is_timer_expired(ssl)) {
|
2014-12-14 00:28:18 +00:00
|
|
|
/* not a timeout, none of our business, let higher layers handle this. In
|
|
|
|
* fact, it's probably an error */
|
|
|
|
return code;
|
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
if (!SSL_in_init(ssl)) {
|
2014-12-14 00:28:18 +00:00
|
|
|
/* done, no need to send a retransmit */
|
2016-05-20 19:27:17 +01:00
|
|
|
BIO_set_flags(ssl->rbio, BIO_FLAGS_READ);
|
2014-12-14 00:28:18 +00:00
|
|
|
return code;
|
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
return DTLSv1_handle_timeout(ssl);
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
static uint16_t dtls1_get_queue_priority(uint16_t seq, int is_ccs) {
|
|
|
|
assert(seq * 2 >= seq);
|
|
|
|
|
2014-12-14 00:28:18 +00:00
|
|
|
/* The index of the retransmission queue actually is the message sequence
|
|
|
|
* number, since the queue only contains messages of a single handshake.
|
|
|
|
* However, the ChangeCipherSpec has no message sequence number and so using
|
|
|
|
* only the sequence will result in the CCS and Finished having the same
|
|
|
|
* index. To prevent this, the sequence number is multiplied by 2. In case of
|
|
|
|
* a CCS 1 is subtracted. This does not only differ CSS and Finished, it also
|
|
|
|
* maintains the order of the index (important for priority queues) and fits
|
|
|
|
* in the unsigned short variable. */
|
|
|
|
return seq * 2 - is_ccs;
|
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
static int dtls1_retransmit_message(SSL *ssl, hm_fragment *frag) {
|
2015-02-01 07:33:59 +00:00
|
|
|
/* DTLS renegotiation is unsupported, so only epochs 0 (NULL cipher) and 1
|
|
|
|
* (negotiated cipher) exist. */
|
2015-12-19 22:05:56 +00:00
|
|
|
assert(ssl->d1->w_epoch == 0 || ssl->d1->w_epoch == 1);
|
|
|
|
assert(frag->msg_header.epoch <= ssl->d1->w_epoch);
|
2015-04-05 17:48:30 +01:00
|
|
|
enum dtls1_use_epoch_t use_epoch = dtls1_use_current_epoch;
|
2015-12-19 22:05:56 +00:00
|
|
|
if (ssl->d1->w_epoch == 1 && frag->msg_header.epoch == 0) {
|
2015-04-05 17:48:30 +01:00
|
|
|
use_epoch = dtls1_use_previous_epoch;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
/* TODO(davidben): This cannot handle non-blocking writes. */
|
|
|
|
int ret;
|
|
|
|
if (frag->msg_header.is_ccs) {
|
2015-12-19 22:05:56 +00:00
|
|
|
ret = dtls1_write_change_cipher_spec(ssl, use_epoch);
|
2015-11-03 19:54:39 +00:00
|
|
|
} else {
|
|
|
|
/* Restore the message body.
|
|
|
|
* TODO(davidben): Make this less stateful. */
|
2015-12-19 22:05:56 +00:00
|
|
|
memcpy(ssl->init_buf->data, frag->fragment,
|
2015-11-03 19:54:39 +00:00
|
|
|
frag->msg_header.msg_len + DTLS1_HM_HEADER_LENGTH);
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl->init_num = frag->msg_header.msg_len + DTLS1_HM_HEADER_LENGTH;
|
2014-12-14 00:28:18 +00:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
dtls1_set_message_header(ssl, frag->msg_header.type,
|
2015-11-03 19:54:39 +00:00
|
|
|
frag->msg_header.msg_len, frag->msg_header.seq,
|
|
|
|
0, frag->msg_header.frag_len);
|
2015-12-19 22:05:56 +00:00
|
|
|
ret = dtls1_do_handshake_write(ssl, use_epoch);
|
2015-11-03 19:54:39 +00:00
|
|
|
}
|
|
|
|
|
2014-12-14 00:28:18 +00:00
|
|
|
return ret;
|
|
|
|
}
|
2014-06-20 20:00:00 +01:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
int dtls1_retransmit_buffered_messages(SSL *ssl) {
|
2016-05-06 01:45:48 +01:00
|
|
|
/* Ensure we are packing handshake messages. */
|
|
|
|
const int was_buffered = ssl_is_wbio_buffered(ssl);
|
|
|
|
assert(was_buffered == SSL_in_init(ssl));
|
2016-05-06 02:50:24 +01:00
|
|
|
if (!was_buffered && !ssl_init_wbio_buffer(ssl)) {
|
2016-05-06 01:45:48 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
assert(ssl_is_wbio_buffered(ssl));
|
2015-02-19 23:51:58 +00:00
|
|
|
|
2016-05-06 01:45:48 +01:00
|
|
|
int ret = -1;
|
|
|
|
piterator iter = pqueue_iterator(ssl->d1->sent_messages);
|
|
|
|
pitem *item;
|
2015-02-19 23:51:58 +00:00
|
|
|
for (item = pqueue_next(&iter); item != NULL; item = pqueue_next(&iter)) {
|
|
|
|
hm_fragment *frag = (hm_fragment *)item->data;
|
2015-12-19 22:05:56 +00:00
|
|
|
if (dtls1_retransmit_message(ssl, frag) <= 0) {
|
2016-05-06 01:45:48 +01:00
|
|
|
goto err;
|
2015-02-19 23:51:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-20 19:27:17 +01:00
|
|
|
ret = BIO_flush(ssl->wbio);
|
2016-05-06 02:17:53 +01:00
|
|
|
if (ret <= 0) {
|
|
|
|
ssl->rwstate = SSL_WRITING;
|
|
|
|
goto err;
|
|
|
|
}
|
2016-05-06 01:45:48 +01:00
|
|
|
|
|
|
|
err:
|
|
|
|
if (!was_buffered) {
|
|
|
|
ssl_free_wbio_buffer(ssl);
|
|
|
|
}
|
|
|
|
return ret;
|
2015-02-19 23:51:58 +00:00
|
|
|
}
|
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
/* dtls1_buffer_change_cipher_spec adds a ChangeCipherSpec to the current
|
|
|
|
* handshake flight, ordered just before the handshake message numbered
|
|
|
|
* |seq|. */
|
|
|
|
static int dtls1_buffer_change_cipher_spec(SSL *ssl, uint16_t seq) {
|
|
|
|
hm_fragment *frag = dtls1_hm_fragment_new(0 /* frag_len */,
|
|
|
|
0 /* no reassembly */);
|
|
|
|
if (frag == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
frag->msg_header.is_ccs = 1;
|
|
|
|
frag->msg_header.epoch = ssl->d1->w_epoch;
|
|
|
|
|
|
|
|
uint16_t priority = dtls1_get_queue_priority(seq, 1 /* is_ccs */);
|
2015-02-19 23:51:58 +00:00
|
|
|
uint8_t seq64be[8];
|
2015-11-03 19:54:39 +00:00
|
|
|
memset(seq64be, 0, sizeof(seq64be));
|
|
|
|
seq64be[6] = (uint8_t)(priority >> 8);
|
|
|
|
seq64be[7] = (uint8_t)priority;
|
|
|
|
|
|
|
|
pitem *item = pitem_new(seq64be, frag);
|
|
|
|
if (item == NULL) {
|
|
|
|
dtls1_hm_fragment_free(frag);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
pqueue_insert(ssl->d1->sent_messages, item);
|
|
|
|
return 1;
|
|
|
|
}
|
2015-02-19 23:51:58 +00:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
int dtls1_buffer_message(SSL *ssl) {
|
2015-02-19 23:51:58 +00:00
|
|
|
/* this function is called immediately after a message has
|
|
|
|
* been serialized */
|
2015-12-19 22:05:56 +00:00
|
|
|
assert(ssl->init_off == 0);
|
2015-02-19 23:51:58 +00:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
hm_fragment *frag = dtls1_hm_fragment_new(ssl->init_num, 0);
|
2015-02-19 23:51:58 +00:00
|
|
|
if (!frag) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
memcpy(frag->fragment, ssl->init_buf->data, ssl->init_num);
|
2015-02-19 23:51:58 +00:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
assert(ssl->d1->w_msg_hdr.msg_len + DTLS1_HM_HEADER_LENGTH ==
|
|
|
|
(unsigned int)ssl->init_num);
|
2015-02-19 23:51:58 +00:00
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
frag->msg_header.msg_len = ssl->d1->w_msg_hdr.msg_len;
|
|
|
|
frag->msg_header.seq = ssl->d1->w_msg_hdr.seq;
|
|
|
|
frag->msg_header.type = ssl->d1->w_msg_hdr.type;
|
2015-02-19 23:51:58 +00:00
|
|
|
frag->msg_header.frag_off = 0;
|
2015-12-19 22:05:56 +00:00
|
|
|
frag->msg_header.frag_len = ssl->d1->w_msg_hdr.msg_len;
|
2015-11-03 19:54:39 +00:00
|
|
|
frag->msg_header.is_ccs = 0;
|
2015-12-19 22:05:56 +00:00
|
|
|
frag->msg_header.epoch = ssl->d1->w_epoch;
|
2015-02-19 23:51:58 +00:00
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
uint16_t priority = dtls1_get_queue_priority(frag->msg_header.seq,
|
|
|
|
0 /* handshake */);
|
|
|
|
uint8_t seq64be[8];
|
2015-02-19 23:51:58 +00:00
|
|
|
memset(seq64be, 0, sizeof(seq64be));
|
2015-11-03 19:54:39 +00:00
|
|
|
seq64be[6] = (uint8_t)(priority >> 8);
|
|
|
|
seq64be[7] = (uint8_t)priority;
|
2015-02-19 23:51:58 +00:00
|
|
|
|
2015-11-03 19:54:39 +00:00
|
|
|
pitem *item = pitem_new(seq64be, frag);
|
2015-02-19 23:51:58 +00:00
|
|
|
if (item == NULL) {
|
|
|
|
dtls1_hm_fragment_free(frag);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
pqueue_insert(ssl->d1->sent_messages, item);
|
2015-02-19 23:51:58 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
int dtls1_send_change_cipher_spec(SSL *ssl, int a, int b) {
|
|
|
|
if (ssl->state == a) {
|
2015-11-03 19:54:39 +00:00
|
|
|
/* Buffer the message to handle retransmits. */
|
2015-12-19 22:05:56 +00:00
|
|
|
ssl->d1->handshake_write_seq = ssl->d1->next_handshake_write_seq;
|
|
|
|
dtls1_buffer_change_cipher_spec(ssl, ssl->d1->handshake_write_seq);
|
|
|
|
ssl->state = b;
|
2015-11-03 19:54:39 +00:00
|
|
|
}
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
return dtls1_write_change_cipher_spec(ssl, dtls1_use_current_epoch);
|
2015-11-03 19:54:39 +00:00
|
|
|
}
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
/* call this function when the buffered messages are no longer needed */
|
2015-12-19 22:05:56 +00:00
|
|
|
void dtls1_clear_record_buffer(SSL *ssl) {
|
2014-12-14 00:28:18 +00:00
|
|
|
pitem *item;
|
|
|
|
|
2015-12-19 22:05:56 +00:00
|
|
|
for (item = pqueue_pop(ssl->d1->sent_messages); item != NULL;
|
|
|
|
item = pqueue_pop(ssl->d1->sent_messages)) {
|
2014-12-14 00:28:18 +00:00
|
|
|
dtls1_hm_fragment_free((hm_fragment *)item->data);
|
|
|
|
pitem_free(item);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-20 20:00:00 +01:00
|
|
|
/* don't actually do the writing, wait till the MTU has been retrieved */
|
2015-12-19 22:05:56 +00:00
|
|
|
void dtls1_set_message_header(SSL *ssl, uint8_t mt, unsigned long len,
|
2014-12-14 23:52:44 +00:00
|
|
|
unsigned short seq_num, unsigned long frag_off,
|
|
|
|
unsigned long frag_len) {
|
2015-12-19 22:05:56 +00:00
|
|
|
struct hm_header_st *msg_hdr = &ssl->d1->w_msg_hdr;
|
2014-12-14 00:28:18 +00:00
|
|
|
|
|
|
|
msg_hdr->type = mt;
|
|
|
|
msg_hdr->msg_len = len;
|
|
|
|
msg_hdr->seq = seq_num;
|
|
|
|
msg_hdr->frag_off = frag_off;
|
|
|
|
msg_hdr->frag_len = frag_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned int dtls1_min_mtu(void) {
|
2015-01-12 00:31:22 +00:00
|
|
|
return kMinMTU;
|
2014-12-14 00:28:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void dtls1_get_message_header(uint8_t *data,
|
|
|
|
struct hm_header_st *msg_hdr) {
|
|
|
|
memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
|
|
|
|
msg_hdr->type = *(data++);
|
|
|
|
n2l3(data, msg_hdr->msg_len);
|
|
|
|
|
|
|
|
n2s(data, msg_hdr->seq);
|
|
|
|
n2l3(data, msg_hdr->frag_off);
|
|
|
|
n2l3(data, msg_hdr->frag_len);
|
|
|
|
}
|