diff options
| author |   jsing <jsing@openbsd.org> | 2020-10-11 03:47:59 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-10-11 03:47:59 +0000 |
| commit | d25254fb5cde7dde39c459a65d05cd23b4bc7e6d (patch) | |
| tree | cacbbefdb9cafc866dc6b4f29bfd472275e28070 /lib/libssl/d1_both.c | |
| parent | Handle absence of TLS certs while parsing the config (diff) | |
| download | wireguard-openbsd-d25254fb5cde7dde39c459a65d05cd23b4bc7e6d.tar.xz wireguard-openbsd-d25254fb5cde7dde39c459a65d05cd23b4bc7e6d.zip | |
Fix an assert conditioned on DTLS1_VERSION.
This condition previously existed for DTLS BAD_VER, which has long been
removed. Furthermore, conditioning on DTLS1_VERSION means this is broken
for any newer DTLS version. While here roll up two assertions into one.
ok tb@
Diffstat (limited to 'lib/libssl/d1_both.c')
| -rw-r--r-- | lib/libssl/d1_both.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/libssl/d1_both.c b/lib/libssl/d1_both.c index 3d2516ce412..64b9818f522 100644 --- a/lib/libssl/d1_both.c +++ b/lib/libssl/d1_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_both.c,v 1.60 2020/09/26 14:43:17 jsing Exp $ */ +/* $OpenBSD: d1_both.c,v 1.61 2020/10/11 03:47:59 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -973,14 +973,9 @@ dtls1_buffer_message(SSL *s, int is_ccs) memcpy(frag->fragment, s->internal->init_buf->data, s->internal->init_num); - if (is_ccs) { - OPENSSL_assert(D1I(s)->w_msg_hdr.msg_len + - ((s->version == DTLS1_VERSION) ? - DTLS1_CCS_HEADER_LENGTH : 3) == (unsigned int)s->internal->init_num); - } else { - OPENSSL_assert(D1I(s)->w_msg_hdr.msg_len + - DTLS1_HM_HEADER_LENGTH == (unsigned int)s->internal->init_num); - } + OPENSSL_assert(D1I(s)->w_msg_hdr.msg_len + + (is_ccs ? DTLS1_CCS_HEADER_LENGTH : DTLS1_HM_HEADER_LENGTH) == + (unsigned int)s->internal->init_num); frag->msg_header.msg_len = D1I(s)->w_msg_hdr.msg_len; frag->msg_header.seq = D1I(s)->w_msg_hdr.seq; |