Add flags for DH FIPS method.

[openssl.git] / fips / fips.h

diff --git a/fips/fips.h b/fips/fips.h
index 4bebd4cfca9d502e069164c4459fbb01a43878ff..6731d692a1c74e9852adbb655109ce0b7b0c79d9 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -48,6 +48,7 @@
  */
 
 #include <openssl/opensslconf.h>
+#include <stdarg.h>
 
 #ifndef OPENSSL_FIPS
 #error FIPS is disabled.
@@ -59,6 +60,10 @@
 extern "C" {
 #endif
 
+#ifndef OPENSSL_FIPSCANISTER
+#define OPENSSL_FIPSCAPABLE
+#endif
+
 struct dsa_st;
 struct ec_key_st;
 struct rsa_st;
@@ -67,6 +72,9 @@ struct env_md_st;
 struct env_md_ctx_st;
 struct evp_cipher_st;
 struct evp_cipher_ctx_st;
+struct ec_method_st;
+struct ecdsa_method;
+struct dh_method;
 
 int FIPS_module_mode_set(int onoff);
 int FIPS_module_mode(void);
@@ -105,6 +113,10 @@ void FIPS_set_locking_callbacks(void (*func)(int mode, int type,
                                int (*add_cb)(int *pointer, int amount,
                                        int type, const char *file, int line));
 
+void FIPS_set_error_callbacks(
+       void (*put_cb)(int lib, int func,int reason,const char *file,int line),
+       void (*add_cb)(int num, va_list args) );
+
 void FIPS_set_malloc_callbacks(
                void *(*malloc_cb)(int num, const char *file, int line),
                void (*free_cb)(void *));
@@ -262,6 +274,19 @@ 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);
+
+const struct ec_method_st *fips_ec_gf2m_simple_method(void);
+const struct ec_method_st *fips_ec_gfp_simple_method(void);
+const struct ec_method_st *fips_ec_gfp_mont_method(void);
+const struct ec_method_st *fips_ec_gfp_nist_method(void);
+
+const struct ecdsa_method *FIPS_ecdsa_openssl(void);
+const struct ecdh_method *FIPS_ecdh_openssl(void);
+
+int FIPS_ec_key_generate_key(struct ec_key_st *key);
+
+const struct dh_method *FIPS_dh_openssl(void);
 
 #endif