From: Pauli <ppzgs1@gmail.com>
Date: Tue, 11 Feb 2025 23:10:54 +0000 (+1100)
Subject: evp: include one shot keygen functions for internal FIPS use
X-Git-Tag: openssl-3.5.0-alpha1~501
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53e3a54b6027da737ef1b82b08fe066eed9d514f;p=thirdparty%2Fopenssl.git

evp: include one shot keygen functions for internal FIPS use

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26714)
---

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index f7932e23f99..d3997a9e6fc 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -1193,6 +1193,7 @@ int EVP_PKEY_CTX_get_group_name(EVP_PKEY_CTX *ctx, char *name, size_t namelen)
         return -1;
     return 1;
 }
+#endif  /* !FIPS_MODULE */
 
 /*
  * evp_pkey_keygen() abstracts from the explicit use of B<EVP_PKEY_CTX>
@@ -1244,6 +1245,7 @@ EVP_PKEY *EVP_PKEY_Q_keygen(OSSL_LIB_CTX *libctx, const char *propq,
     return ret;
 }
 
+#if !defined(FIPS_MODULE)
 int EVP_CIPHER_CTX_set_algor_params(EVP_CIPHER_CTX *ctx, const X509_ALGOR *alg)
 {
     int ret = -1;                /* Assume the worst */