]> git.ipfire.org Git - thirdparty/openssl.git/commit
Cleanups for FIPS options..
authorslontis <shane.lontis@oracle.com>
Mon, 12 Aug 2024 09:31:10 +0000 (19:31 +1000)
committerTomas Mraz <tomas@openssl.org>
Wed, 28 Aug 2024 12:46:16 +0000 (14:46 +0200)
commitf6a296c3867f53cd005069292d512280835bcdae
treefe67fa62009ffed85f9b5df91b90185619d16c73
parentaccd835f8d6ed946eb540a3e2e82f9723093f094
Cleanups for FIPS options..

The options in fipsprov.c are now generated using macros with fips_indicator_params.inc.
This should keep the naming consistent.

Some FIPS related headers have moved to providers/fips/include so that
they can use fips_indicator_params.inc.
securitycheck.h now includes fipsindicator.h, and fipsindicator.h includes
fipscommon.h.

fipsinstall.c uses OSSL_PROV_PARAM_ for the configurable FIPS options rather than
using OSSL_PROV_FIPS_PARAM_* as this was confusing as to which one should be used.
fips_names.h just uses aliases now for existing public names.

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25162)
46 files changed:
apps/fipsinstall.c
include/openssl/fips_names.h
providers/build.info
providers/common/include/prov/fipscommon.h [deleted file]
providers/common/include/prov/securitycheck.h
providers/common/securitycheck.c
providers/common/securitycheck_default.c
providers/common/securitycheck_fips.c
providers/fips/fipsindicator.c
providers/fips/fipsprov.c
providers/fips/include/fips/fipsindicator.h [moved from providers/common/include/prov/fipsindicator.h with 99% similarity]
providers/fips/include/fips_indicator_params.inc [new file with mode: 0644]
providers/fips/include/fips_selftest_params.inc [new file with mode: 0644]
providers/fips/include/fipscommon.h [new file with mode: 0644]
providers/implementations/asymciphers/rsa_enc.c
providers/implementations/ciphers/cipher_tdes.h
providers/implementations/ciphers/cipher_tdes_common.c
providers/implementations/exchange/dh_exch.c
providers/implementations/exchange/ecdh_exch.c
providers/implementations/exchange/ecx_exch.c
providers/implementations/kdfs/hkdf.c
providers/implementations/kdfs/kbkdf.c
providers/implementations/kdfs/pbkdf2.c
providers/implementations/kdfs/sshkdf.c
providers/implementations/kdfs/sskdf.c
providers/implementations/kdfs/tls1_prf.c
providers/implementations/kem/rsa_kem.c
providers/implementations/keymgmt/dsa_kmgmt.c
providers/implementations/keymgmt/ec_kmgmt.c
providers/implementations/keymgmt/ecx_kmgmt.c
providers/implementations/macs/cmac_prov.c
providers/implementations/macs/hmac_prov.c
providers/implementations/macs/kmac_prov.c
providers/implementations/rands/drbg.c
providers/implementations/rands/drbg_local.h
providers/implementations/rands/test_rng.c
providers/implementations/signature/dsa_sig.c
providers/implementations/signature/ecdsa_sig.c
providers/implementations/signature/eddsa_sig.c
providers/implementations/signature/rsa_sig.c
test/build.info
test/recipes/03-test_fipsinstall.t
test/recipes/80-test_ssl_old.t
test/recipes/90-test_sslapi.t
util/mk-fipsmodule-cnf.pl
util/perl/OpenSSL/paramnames.pm