mirror of
https://github.com/opnsense/src.git
synced 2026-04-25 08:07:28 -04:00
b077aed33b
Migrate to OpenSSL 3.0 in advance of FreeBSD 14.0. OpenSSL 1.1.1 (the version we were previously using) will be EOL as of 2023-09-11. Most of the base system has already been updated for a seamless switch to OpenSSL 3.0. For many components we've added `-DOPENSSL_API_COMPAT=0x10100000L` to CFLAGS to specify the API version, which avoids deprecation warnings from OpenSSL 3.0. Changes have also been made to avoid OpenSSL APIs that were already deprecated in OpenSSL 1.1.1. The process of updating to contemporary APIs can continue after this merge. Additional changes are still required for libarchive and Kerberos- related libraries or tools; workarounds will immediately follow this commit. Fixes are in progress in the upstream projects and will be incorporated when those are next updated. There are some performance regressions in benchmarks (certain tests in `openssl speed`) and in some OpenSSL consumers in ports (e.g. haproxy). Investigation will continue for these. Netflix's testing showed no functional regression and a rather small, albeit statistically significant, increase in CPU consumption with OpenSSL 3.0. Thanks to ngie@ and des@ for updating base system components, to antoine@ and bofh@ for ports exp-runs and port fixes/workarounds, and to Netflix and everyone who tested prior to commit or contributed to this update in other ways. PR: 271615 PR: 271656 [exp-run] Relnotes: Yes Sponsored by: The FreeBSD Foundation
78 lines
2.1 KiB
C
78 lines
2.1 KiB
C
/*
|
|
* Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include "../ssl_local.h"
|
|
#include "record_local.h"
|
|
|
|
/* mod 128 saturating subtract of two 64-bit values in big-endian order */
|
|
static int satsub64be(const unsigned char *v1, const unsigned char *v2)
|
|
{
|
|
int64_t ret;
|
|
uint64_t l1, l2;
|
|
|
|
n2l8(v1, l1);
|
|
n2l8(v2, l2);
|
|
|
|
ret = l1 - l2;
|
|
|
|
/* We do not permit wrap-around */
|
|
if (l1 > l2 && ret < 0)
|
|
return 128;
|
|
else if (l2 > l1 && ret > 0)
|
|
return -128;
|
|
|
|
if (ret > 128)
|
|
return 128;
|
|
else if (ret < -128)
|
|
return -128;
|
|
else
|
|
return (int)ret;
|
|
}
|
|
|
|
int dtls1_record_replay_check(SSL *s, DTLS1_BITMAP *bitmap)
|
|
{
|
|
int cmp;
|
|
unsigned int shift;
|
|
const unsigned char *seq = s->rlayer.read_sequence;
|
|
|
|
cmp = satsub64be(seq, bitmap->max_seq_num);
|
|
if (cmp > 0) {
|
|
SSL3_RECORD_set_seq_num(RECORD_LAYER_get_rrec(&s->rlayer), seq);
|
|
return 1; /* this record in new */
|
|
}
|
|
shift = -cmp;
|
|
if (shift >= sizeof(bitmap->map) * 8)
|
|
return 0; /* stale, outside the window */
|
|
else if (bitmap->map & (1UL << shift))
|
|
return 0; /* record previously received */
|
|
|
|
SSL3_RECORD_set_seq_num(RECORD_LAYER_get_rrec(&s->rlayer), seq);
|
|
return 1;
|
|
}
|
|
|
|
void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap)
|
|
{
|
|
int cmp;
|
|
unsigned int shift;
|
|
const unsigned char *seq = RECORD_LAYER_get_read_sequence(&s->rlayer);
|
|
|
|
cmp = satsub64be(seq, bitmap->max_seq_num);
|
|
if (cmp > 0) {
|
|
shift = cmp;
|
|
if (shift < sizeof(bitmap->map) * 8)
|
|
bitmap->map <<= shift, bitmap->map |= 1UL;
|
|
else
|
|
bitmap->map = 1UL;
|
|
memcpy(bitmap->max_seq_num, seq, SEQ_NUM_SIZE);
|
|
} else {
|
|
shift = -cmp;
|
|
if (shift < sizeof(bitmap->map) * 8)
|
|
bitmap->map |= 1UL << shift;
|
|
}
|
|
}
|