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
95 lines
4.6 KiB
SQL
95 lines
4.6 KiB
SQL
/*
|
|
* 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
|
|
*/
|
|
|
|
#ifndef DECODER_PROVIDER
|
|
# error Macro DECODER_PROVIDER undefined
|
|
#endif
|
|
|
|
#define DECODER_STRUCTURE_type_specific_keypair "type-specific"
|
|
#define DECODER_STRUCTURE_type_specific_params "type-specific"
|
|
#define DECODER_STRUCTURE_type_specific "type-specific"
|
|
#define DECODER_STRUCTURE_type_specific_no_pub "type-specific"
|
|
#define DECODER_STRUCTURE_EncryptedPrivateKeyInfo "EncryptedPrivateKeyInfo"
|
|
#define DECODER_STRUCTURE_PrivateKeyInfo "PrivateKeyInfo"
|
|
#define DECODER_STRUCTURE_SubjectPublicKeyInfo "SubjectPublicKeyInfo"
|
|
#define DECODER_STRUCTURE_DH "dh"
|
|
#define DECODER_STRUCTURE_DHX "dhx"
|
|
#define DECODER_STRUCTURE_DSA "dsa"
|
|
#define DECODER_STRUCTURE_EC "ec"
|
|
#define DECODER_STRUCTURE_RSA "rsa"
|
|
|
|
/* Arguments are prefixed with '_' to avoid build breaks on certain platforms */
|
|
#define DECODER(_name, _input, _output, _fips) \
|
|
{ _name, \
|
|
"provider=" DECODER_PROVIDER ",fips=" #_fips ",input=" #_input, \
|
|
(ossl_##_input##_to_##_output##_decoder_functions) }
|
|
#define DECODER_w_structure(_name, _input, _structure, _output, _fips) \
|
|
{ _name, \
|
|
"provider=" DECODER_PROVIDER ",fips=" #_fips ",input=" #_input \
|
|
",structure=" DECODER_STRUCTURE_##_structure, \
|
|
(ossl_##_structure##_##_input##_to_##_output##_decoder_functions) }
|
|
|
|
#ifndef OPENSSL_NO_DH
|
|
DECODER_w_structure("DH", der, PrivateKeyInfo, dh, yes),
|
|
DECODER_w_structure("DH", der, SubjectPublicKeyInfo, dh, yes),
|
|
DECODER_w_structure("DH", der, type_specific_params, dh, yes),
|
|
DECODER_w_structure("DH", der, DH, dh, yes),
|
|
DECODER_w_structure("DHX", der, PrivateKeyInfo, dhx, yes),
|
|
DECODER_w_structure("DHX", der, SubjectPublicKeyInfo, dhx, yes),
|
|
DECODER_w_structure("DHX", der, type_specific_params, dhx, yes),
|
|
DECODER_w_structure("DHX", der, DHX, dhx, yes),
|
|
#endif
|
|
#ifndef OPENSSL_NO_DSA
|
|
DECODER_w_structure("DSA", der, PrivateKeyInfo, dsa, yes),
|
|
DECODER_w_structure("DSA", der, SubjectPublicKeyInfo, dsa, yes),
|
|
DECODER_w_structure("DSA", der, type_specific, dsa, yes),
|
|
DECODER_w_structure("DSA", der, DSA, dsa, yes),
|
|
DECODER("DSA", msblob, dsa, yes),
|
|
DECODER("DSA", pvk, dsa, yes),
|
|
#endif
|
|
#ifndef OPENSSL_NO_EC
|
|
DECODER_w_structure("EC", der, PrivateKeyInfo, ec, yes),
|
|
DECODER_w_structure("EC", der, SubjectPublicKeyInfo, ec, yes),
|
|
DECODER_w_structure("EC", der, type_specific_no_pub, ec, yes),
|
|
DECODER_w_structure("EC", der, EC, ec, yes),
|
|
DECODER_w_structure("ED25519", der, PrivateKeyInfo, ed25519, yes),
|
|
DECODER_w_structure("ED25519", der, SubjectPublicKeyInfo, ed25519, yes),
|
|
DECODER_w_structure("ED448", der, PrivateKeyInfo, ed448, yes),
|
|
DECODER_w_structure("ED448", der, SubjectPublicKeyInfo, ed448, yes),
|
|
DECODER_w_structure("X25519", der, PrivateKeyInfo, x25519, yes),
|
|
DECODER_w_structure("X25519", der, SubjectPublicKeyInfo, x25519, yes),
|
|
DECODER_w_structure("X448", der, PrivateKeyInfo, x448, yes),
|
|
DECODER_w_structure("X448", der, SubjectPublicKeyInfo, x448, yes),
|
|
# ifndef OPENSSL_NO_SM2
|
|
DECODER_w_structure("SM2", der, PrivateKeyInfo, sm2, no),
|
|
DECODER_w_structure("SM2", der, SubjectPublicKeyInfo, sm2, no),
|
|
# endif
|
|
#endif
|
|
DECODER_w_structure("RSA", der, PrivateKeyInfo, rsa, yes),
|
|
DECODER_w_structure("RSA", der, SubjectPublicKeyInfo, rsa, yes),
|
|
DECODER_w_structure("RSA", der, type_specific_keypair, rsa, yes),
|
|
DECODER_w_structure("RSA", der, RSA, rsa, yes),
|
|
DECODER_w_structure("RSA-PSS", der, PrivateKeyInfo, rsapss, yes),
|
|
DECODER_w_structure("RSA-PSS", der, SubjectPublicKeyInfo, rsapss, yes),
|
|
DECODER("RSA", msblob, rsa, yes),
|
|
DECODER("RSA", pvk, rsa, yes),
|
|
|
|
/*
|
|
* A decoder that takes a SubjectPublicKeyInfo and figures out the types of key
|
|
* that it contains. The output is the same SubjectPublicKeyInfo
|
|
*/
|
|
DECODER_w_structure("DER", der, SubjectPublicKeyInfo, der, yes),
|
|
DECODER("DER", pem, der, yes),
|
|
/*
|
|
* A decoder that recognises PKCS#8 EncryptedPrivateKeyInfo structure
|
|
* and decrypts it, passing on the unencrypted PrivateKeyInfo in DER
|
|
* form to the next decoder.
|
|
*/
|
|
DECODER_w_structure("DER", der, EncryptedPrivateKeyInfo, der, yes),
|