diff -rupN --no-dereference openssl-3.0.9/include/openssl/core_names.h openssl-3.0.9-new/include/openssl/core_names.h --- openssl-3.0.9/include/openssl/core_names.h 2023-05-31 14:33:17.985112480 +0200 +++ openssl-3.0.9-new/include/openssl/core_names.h 2023-05-31 14:33:19.031112023 +0200 @@ -224,6 +224,7 @@ extern "C" { #define OSSL_KDF_PARAM_X942_SUPP_PUBINFO "supp-pubinfo" #define OSSL_KDF_PARAM_X942_SUPP_PRIVINFO "supp-privinfo" #define OSSL_KDF_PARAM_X942_USE_KEYBITS "use-keybits" +#define OSSL_KDF_PARAM_HKDF_REDHAT_FIPS_INDICATOR "hkdf-fips-indicator" /* Known KDF names */ #define OSSL_KDF_NAME_HKDF "HKDF" diff -rupN --no-dereference openssl-3.0.9/include/openssl/kdf.h openssl-3.0.9-new/include/openssl/kdf.h --- openssl-3.0.9/include/openssl/kdf.h 2023-05-30 14:31:57.000000000 +0200 +++ openssl-3.0.9-new/include/openssl/kdf.h 2023-05-31 14:33:19.031112023 +0200 @@ -63,6 +63,10 @@ int EVP_KDF_names_do_all(const EVP_KDF * # define EVP_KDF_HKDF_MODE_EXTRACT_ONLY 1 # define EVP_KDF_HKDF_MODE_EXPAND_ONLY 2 +# define EVP_KDF_HKDF_FIPS_INDICATOR_UNDETERMINED 0 +# define EVP_KDF_HKDF_FIPS_INDICATOR_APPROVED 1 +# define EVP_KDF_HKDF_FIPS_INDICATOR_NOT_APPROVED 2 + #define EVP_KDF_SSHKDF_TYPE_INITIAL_IV_CLI_TO_SRV 65 #define EVP_KDF_SSHKDF_TYPE_INITIAL_IV_SRV_TO_CLI 66 #define EVP_KDF_SSHKDF_TYPE_ENCRYPTION_KEY_CLI_TO_SRV 67 diff -rupN --no-dereference openssl-3.0.9/providers/implementations/kdfs/hkdf.c openssl-3.0.9-new/providers/implementations/kdfs/hkdf.c --- openssl-3.0.9/providers/implementations/kdfs/hkdf.c 2023-05-31 14:33:19.027112025 +0200 +++ openssl-3.0.9-new/providers/implementations/kdfs/hkdf.c 2023-05-31 14:33:19.032112022 +0200 @@ -340,6 +340,56 @@ static int kdf_hkdf_get_ctx_params(void return 0; return OSSL_PARAM_set_size_t(p, sz); } + +#ifdef FIPS_MODULE + if ((p = OSSL_PARAM_locate(params, + OSSL_KDF_PARAM_HKDF_REDHAT_FIPS_INDICATOR)) != NULL) { + int fips_indicator = EVP_KDF_HKDF_FIPS_INDICATOR_UNDETERMINED; + switch (ctx->mode) { + case EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND: + /* TLS 1.3 never uses extract-and-expand */ + fips_indicator = EVP_KDF_HKDF_FIPS_INDICATOR_NOT_APPROVED; + break; + case EVP_KDF_HKDF_MODE_EXTRACT_ONLY: + { + /* When TLS 1.3 uses extract, the following holds: + * 1. The salt length matches the hash length, and either + * 2.1. the key is all zeroes and matches the hash length, or + * 2.2. the key originates from a PSK (resumption_master_secret + * or some externally esablished key), or an ECDH or DH key + * derivation. See + * https://www.rfc-editor.org/rfc/rfc8446#section-7.1. + * Unfortunately at this point, we cannot verify where the key + * comes from, so all we can do is check the salt length. + */ + const EVP_MD *md = ossl_prov_digest_md(&ctx->digest); + if (md != NULL && ctx->salt_len == EVP_MD_get_size(md)) + fips_indicator = EVP_KDF_HKDF_FIPS_INDICATOR_APPROVED; + else + fips_indicator = EVP_KDF_HKDF_FIPS_INDICATOR_NOT_APPROVED; + } + break; + case EVP_KDF_HKDF_MODE_EXPAND_ONLY: + /* When TLS 1.3 uses expand, it always provides a label that + * contains an uint16 for the length, followed by between 7 and 255 + * bytes for a label string that starts with "tls13 " or "dtls13". + * For compatibility with future versions, we only check for "tls" + * or "dtls". See + * https://www.rfc-editor.org/rfc/rfc8446#section-7.1 and + * https://www.rfc-editor.org/rfc/rfc9147#section-5.9. */ + if (ctx->label != NULL + && ctx->label_len >= 2 /* length */ + 4 /* "dtls" */ + && (strncmp("tls", (const char *)ctx->label + 2, 3) == 0 || + strncmp("dtls", (const char *)ctx->label + 2, 4) == 0)) + fips_indicator = EVP_KDF_HKDF_FIPS_INDICATOR_APPROVED; + else + fips_indicator = EVP_KDF_HKDF_FIPS_INDICATOR_NOT_APPROVED; + break; + } + return OSSL_PARAM_set_int(p, fips_indicator); + } +#endif /* defined(FIPS_MODULE) */ + return -2; } @@ -348,6 +398,9 @@ static const OSSL_PARAM *kdf_hkdf_gettab { static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_KDF_PARAM_SIZE, NULL), +#ifdef FIPS_MODULE + OSSL_PARAM_int(OSSL_KDF_PARAM_HKDF_REDHAT_FIPS_INDICATOR, NULL), +#endif /* defined(FIPS_MODULE) */ OSSL_PARAM_END }; return known_gettable_ctx_params;