From: Dr. Stephen Henson Date: Fri, 3 Jun 2011 16:26:58 +0000 (+0000) Subject: Add "OPENSSL_FIPSCAPABLE" define for a version of OpenSSL which is X-Git-Tag: OpenSSL-fips-2_0-rc1~347 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=549c4ad35b07c494d380e06d422af522cb21d108;p=oweals%2Fopenssl.git Add "OPENSSL_FIPSCAPABLE" define for a version of OpenSSL which is FIPS capable: i.e. FIPS module is supplied externally. --- diff --git a/fips/fips.h b/fips/fips.h index 4bebd4cfca..5d8f626561 100644 --- a/fips/fips.h +++ b/fips/fips.h @@ -59,6 +59,10 @@ extern "C" { #endif +#ifndef OPENSSL_FIPSCANISTER +#define OPENSSL_FIPSCAPABLE +#endif + struct dsa_st; struct ec_key_st; struct rsa_st; @@ -262,6 +266,7 @@ const EVP_MD *FIPS_evp_dss(void); const EVP_MD *FIPS_evp_ecdsa(void); const RSA_METHOD *FIPS_rsa_pkcs1_ssleay(void); +int FIPS_rsa_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb); #endif