mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-28 03:42:04 +01: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.7 KiB
C
78 lines
2.7 KiB
C
/*
|
|
* Copyright 2020-2021 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 <openssl/core_dispatch.h>
|
|
#include "prov/seeding.h"
|
|
|
|
static OSSL_FUNC_get_entropy_fn *c_get_entropy = NULL;
|
|
static OSSL_FUNC_cleanup_entropy_fn *c_cleanup_entropy = NULL;
|
|
static OSSL_FUNC_get_nonce_fn *c_get_nonce = NULL;
|
|
static OSSL_FUNC_cleanup_nonce_fn *c_cleanup_nonce = NULL;
|
|
|
|
int ossl_prov_seeding_from_dispatch(const OSSL_DISPATCH *fns)
|
|
{
|
|
for (; fns->function_id != 0; fns++) {
|
|
/*
|
|
* We do not support the scenario of an application linked against
|
|
* multiple versions of libcrypto (e.g. one static and one dynamic), but
|
|
* sharing a single fips.so. We do a simple sanity check here.
|
|
*/
|
|
#define set_func(c, f) \
|
|
do { if (c == NULL) c = f; else if (c != f) return 0; } while (0)
|
|
switch (fns->function_id) {
|
|
case OSSL_FUNC_GET_ENTROPY:
|
|
set_func(c_get_entropy, OSSL_FUNC_get_entropy(fns));
|
|
break;
|
|
case OSSL_FUNC_CLEANUP_ENTROPY:
|
|
set_func(c_cleanup_entropy, OSSL_FUNC_cleanup_entropy(fns));
|
|
break;
|
|
case OSSL_FUNC_GET_NONCE:
|
|
set_func(c_get_nonce, OSSL_FUNC_get_nonce(fns));
|
|
break;
|
|
case OSSL_FUNC_CLEANUP_NONCE:
|
|
set_func(c_cleanup_nonce, OSSL_FUNC_cleanup_nonce(fns));
|
|
break;
|
|
}
|
|
#undef set_func
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
size_t ossl_prov_get_entropy(PROV_CTX *prov_ctx, unsigned char **pout,
|
|
int entropy, size_t min_len, size_t max_len)
|
|
{
|
|
if (c_get_entropy == NULL)
|
|
return 0;
|
|
return c_get_entropy(ossl_prov_ctx_get0_handle(prov_ctx),
|
|
pout, entropy, min_len, max_len);
|
|
}
|
|
|
|
void ossl_prov_cleanup_entropy(PROV_CTX *prov_ctx, unsigned char *buf,
|
|
size_t len)
|
|
{
|
|
if (c_cleanup_entropy != NULL)
|
|
c_cleanup_entropy(ossl_prov_ctx_get0_handle(prov_ctx), buf, len);
|
|
}
|
|
|
|
size_t ossl_prov_get_nonce(PROV_CTX *prov_ctx, unsigned char **pout,
|
|
size_t min_len, size_t max_len,
|
|
const void *salt,size_t salt_len)
|
|
{
|
|
if (c_get_nonce == NULL)
|
|
return 0;
|
|
return c_get_nonce(ossl_prov_ctx_get0_handle(prov_ctx), pout,
|
|
min_len, max_len, salt, salt_len);
|
|
}
|
|
|
|
void ossl_prov_cleanup_nonce(PROV_CTX *prov_ctx, unsigned char *buf, size_t len)
|
|
{
|
|
if (c_cleanup_nonce != NULL)
|
|
c_cleanup_nonce(ossl_prov_ctx_get0_handle(prov_ctx), buf, len);
|
|
}
|