From c613f080ca482ebfcb94bb64eb9a567a77187ab8 Mon Sep 17 00:00:00 2001
From: Pauli <ppzgs1@gmail.com>
Date: Fri, 26 Jul 2024 10:16:52 +1000
Subject: [PATCH] Add signature digest check option to fipsinstall

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/25020)
---
 apps/fipsinstall.c           | 11 +++++++++++
 include/openssl/fips_names.h |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c
index 70447e1db3..439d83f657 100644
--- a/apps/fipsinstall.c
+++ b/apps/fipsinstall.c
@@ -41,6 +41,7 @@ typedef enum OPTION_choice {
     OPT_TLS_PRF_EMS_CHECK, OPT_EDDSA_NO_VERIFY_DIGESTED, OPT_NO_SHORT_MAC,
     OPT_DISALLOW_PKCS15_PADDING, OPT_DISALLOW_SIGNATURE_X931_PADDING,
     OPT_DISALLOW_DRGB_TRUNC_DIGEST,
+    OPT_SIGNATURE_DIGEST_CHECK,
     OPT_HKDF_DIGEST_CHECK,
     OPT_TLS13_KDF_DIGEST_CHECK,
     OPT_TLS1_PRF_DIGEST_CHECK,
@@ -86,6 +87,8 @@ const OPTIONS fipsinstall_options[] = {
     {"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"},
+    {"signature_digest_check", OPT_SIGNATURE_DIGEST_CHECK, '-',
+     "Enable checking for approved digests for signatures"},
     {"hkdf_digest_check", OPT_HKDF_DIGEST_CHECK, '-',
      "Enable digest check for HKDF"},
     {"tls13_kdf_digest_check", OPT_TLS13_KDF_DIGEST_CHECK, '-',
@@ -146,6 +149,7 @@ typedef struct {
     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;
     unsigned int hkdf_digest_check : 1;
     unsigned int tls13_kdf_digest_check : 1;
     unsigned int tls1_prf_digest_check : 1;
@@ -175,6 +179,7 @@ static const FIPS_OPTS pedantic_opts = {
     1,      /* eddsa_no_verify_digested */
     1,      /* no_short_mac */
     1,      /* drgb_no_trunc_dgst */
+    1,      /* signature_digest_check */
     1,      /* hkdf_digest_check */
     1,      /* tls13_kdf_digest_check */
     1,      /* tls1_prf_digest_check */
@@ -204,6 +209,7 @@ static FIPS_OPTS fips_opts = {
     0,      /* eddsa_no_verify_digested */
     0,      /* no_short_mac */
     0,      /* drgb_no_trunc_dgst */
+    0,      /* signature_digest_check */
     0,      /* hkdf_digest_check */
     0,      /* tls13_kdf_digest_check */
     0,      /* tls1_prf_digest_check */
@@ -349,6 +355,8 @@ static int write_config_fips_section(BIO *out, const char *section,
                       opts->no_short_mac ? "1" : "0") <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST,
                       opts->drgb_no_trunc_dgst ? "1" : "0") <= 0
+        || BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_SIGNATURE_DIGEST_CHECK,
+                      opts->signature_digest_check ? "1" : "0") <= 0
         || BIO_printf(out, "%s = %s\n", OSSL_PROV_FIPS_PARAM_HKDF_DIGEST_CHECK,
                       opts->hkdf_digest_check ? "1": "0") <= 0
         || BIO_printf(out, "%s = %s\n",
@@ -585,6 +593,9 @@ int fipsinstall_main(int argc, char **argv)
         case OPT_DISALLOW_DRGB_TRUNC_DIGEST:
             fips_opts.drgb_no_trunc_dgst = 1;
             break;
+        case OPT_SIGNATURE_DIGEST_CHECK:
+            fips_opts.signature_digest_check = 1;
+            break;
         case OPT_HKDF_DIGEST_CHECK:
             fips_opts.hkdf_digest_check = 1;
             break;
diff --git a/include/openssl/fips_names.h b/include/openssl/fips_names.h
index c83b4b803b..f490ff5de1 100644
--- a/include/openssl/fips_names.h
+++ b/include/openssl/fips_names.h
@@ -85,6 +85,14 @@ extern "C" {
  */
 # define OSSL_PROV_FIPS_PARAM_DRBG_TRUNC_DIGEST "drbg-no-trunc-md"
 
+/*
+ * A boolean that determines if the digest algorithm used as part of a
+ * signature algorithm is in the approved list.
+ * This is disabled by default.
+ * Type: OSSL_PARAM_UTF8_STRING
+ */
+# define OSSL_PROV_FIPS_PARAM_SIGNATURE_DIGEST_CHECK "signature-digest-check"
+
 /*
  * A boolean that determines if the runtime FIPS digest check for HKDF is
  * performed.