diff options
| author | Pauli <ppzgs1@gmail.com> | 2024-08-15 01:53:04 +0200 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2024-08-16 03:34:24 +0200 |
| commit | c14003578a3ea24daf03c76719db7c0c1fb11097 (patch) | |
| tree | a752b29e92d69bc0c8a3f35fa13cfbe927464a2c /apps | |
| parent | Revert "doc: add documentation for -eddsa_no_verify_digested fipsinstall option" (diff) | |
| download | openssl-c14003578a3ea24daf03c76719db7c0c1fb11097.tar.xz openssl-c14003578a3ea24daf03c76719db7c0c1fb11097.zip | |
Revert "fipsinstall: add ed_no_verify_digested option"
This reverts commit 70b6d57fd94fe11fa2510bc8026fa6a6ead51d68.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25192)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/fipsinstall.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c index f217a81121..4d0f916879 100644 --- a/apps/fipsinstall.c +++ b/apps/fipsinstall.c @@ -38,7 +38,7 @@ typedef enum OPTION_choice { OPT_NO_LOG, OPT_CORRUPT_DESC, OPT_CORRUPT_TYPE, OPT_QUIET, OPT_CONFIG, OPT_NO_CONDITIONAL_ERRORS, OPT_NO_SECURITY_CHECKS, - OPT_TLS_PRF_EMS_CHECK, OPT_EDDSA_NO_VERIFY_DIGESTED, OPT_NO_SHORT_MAC, + OPT_TLS_PRF_EMS_CHECK, OPT_NO_SHORT_MAC, OPT_DISALLOW_PKCS15_PADDING, OPT_RSA_PSS_SALTLEN_CHECK, OPT_DISALLOW_SIGNATURE_X931_PADDING, OPT_DISALLOW_DRGB_TRUNC_DIGEST, @@ -84,8 +84,6 @@ const OPTIONS fipsinstall_options[] = { "Forces self tests to run once on module installation"}, {"ems_check", OPT_TLS_PRF_EMS_CHECK, '-', "Enable the run-time FIPS check for EMS during TLS1_PRF"}, - {"eddsa_no_verify_digested", OPT_EDDSA_NO_VERIFY_DIGESTED, '-', - "Disallow Ed25519/Ed448 verification of pre-hashed data"}, {"no_short_mac", OPT_NO_SHORT_MAC, '-', "Disallow short MAC output"}, {"no_drbg_truncated_digests", OPT_DISALLOW_DRGB_TRUNC_DIGEST, '-', "Disallow truncated digests with Hash and HMAC DRBGs"}, @@ -152,7 +150,6 @@ typedef struct { unsigned int conditional_errors : 1; unsigned int security_checks : 1; unsigned int tls_prf_ems_check : 1; - unsigned int eddsa_no_verify_digested : 1; unsigned int no_short_mac : 1; unsigned int drgb_no_trunc_dgst : 1; unsigned int signature_digest_check : 1; @@ -184,7 +181,6 @@ static const FIPS_OPTS pedantic_opts = { 1, /* conditional_errors */ 1, /* security_checks */ 1, /* tls_prf_ems_check */ - 1, /* eddsa_no_verify_digested */ 1, /* no_short_mac */ 1, /* drgb_no_trunc_dgst */ 1, /* signature_digest_check */ @@ -216,7 +212,6 @@ static FIPS_OPTS fips_opts = { 1, /* conditional_errors */ 1, /* security_checks */ 0, /* tls_prf_ems_check */ - 0, /* eddsa_no_verify_digested */ 0, /* no_short_mac */ 0, /* drgb_no_trunc_dgst */ 0, /* signature_digest_check */ @@ -361,8 +356,6 @@ static int write_config_fips_section(BIO *out, const char *section, opts->security_checks ? "1" : "0") <= 0 || BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_TLS1_PRF_EMS_CHECK, opts->tls_prf_ems_check ? "1" : "0") <= 0 - || BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_EDDSA_NO_VERIFY_DIGESTED, - opts->eddsa_no_verify_digested ? "1" : "0") <= 0 || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_NO_SHORT_MAC, opts->no_short_mac ? "1" : "0") <= 0 || BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_DRBG_TRUNC_DIGEST, @@ -601,9 +594,6 @@ int fipsinstall_main(int argc, char **argv) case OPT_TLS_PRF_EMS_CHECK: fips_opts.tls_prf_ems_check = 1; break; - case OPT_EDDSA_NO_VERIFY_DIGESTED: - fips_opts.eddsa_no_verify_digested = 1; - break; case OPT_NO_SHORT_MAC: fips_opts.no_short_mac = 1; break; |