mirror of
https://github.com/opnsense/src.git
synced 2026-02-26 03:13:02 -05: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
45 lines
1.9 KiB
C
45 lines
1.9 KiB
C
/*
|
|
* Copyright 2018-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
|
|
*/
|
|
|
|
/*
|
|
* Options are shared by apps (see apps.h) and the test system
|
|
* (see test/testutil.h').
|
|
* In order to remove the dependency between apps and options, the following
|
|
* shared fields have been moved into this file.
|
|
*/
|
|
|
|
#ifndef OSSL_APPS_FMT_H
|
|
#define OSSL_APPS_FMT_H
|
|
|
|
/*
|
|
* On some platforms, it's important to distinguish between text and binary
|
|
* files. On some, there might even be specific file formats for different
|
|
* contents. The FORMAT_xxx macros are meant to express an intent with the
|
|
* file being read or created.
|
|
*/
|
|
# define B_FORMAT_TEXT 0x8000
|
|
# define FORMAT_UNDEF 0
|
|
# define FORMAT_TEXT (1 | B_FORMAT_TEXT) /* Generic text */
|
|
# define FORMAT_BINARY 2 /* Generic binary */
|
|
# define FORMAT_BASE64 (3 | B_FORMAT_TEXT) /* Base64 */
|
|
# define FORMAT_ASN1 4 /* ASN.1/DER */
|
|
# define FORMAT_PEM (5 | B_FORMAT_TEXT)
|
|
# define FORMAT_PKCS12 6
|
|
# define FORMAT_SMIME (7 | B_FORMAT_TEXT)
|
|
# define FORMAT_ENGINE 8 /* Not really a file format */
|
|
# define FORMAT_PEMRSA (9 | B_FORMAT_TEXT) /* PEM RSAPublicKey format */
|
|
# define FORMAT_ASN1RSA 10 /* DER RSAPublicKey format */
|
|
# define FORMAT_MSBLOB 11 /* MS Key blob format */
|
|
# define FORMAT_PVK 12 /* MS PVK file format */
|
|
# define FORMAT_HTTP 13 /* Download using HTTP */
|
|
# define FORMAT_NSS 14 /* NSS keylog format */
|
|
|
|
int FMT_istext(int format);
|
|
|
|
#endif /* OSSL_APPS_FMT_H_ */
|