]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
evp: include one shot keygen functions for internal FIPS use
authorPauli <ppzgs1@gmail.com>
Tue, 11 Feb 2025 23:10:54 +0000 (10:10 +1100)
committerTomas Mraz <tomas@openssl.org>
Fri, 14 Feb 2025 16:08:42 +0000 (17:08 +0100)
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)

crypto/evp/evp_lib.c

index f7932e23f993cf94adef51ddeaf17a4c01c8f45b..d3997a9e6fcff069387d743662eb819349ebc531 100644 (file)
@@ -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 */