Move function prototype to fips.h

diff --git a/crypto/err/err.h b/crypto/err/err.h
index 3d71e4212e4c4cb2ed4b9a86fa241b129b59d5bb..974cc9cc6f903129936edccff2d8ea78cdf5638b 100644 (file)
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -137,12 +137,6 @@ extern "C" {
 #define ERR_PUT_error(a,b,c,d,e)       ERR_put_error(a,b,c,NULL,0)
 #endif
 
-#ifdef OPENSSL_FIPS
-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) );
-#endif
-
 #include <errno.h>
 
 #define ERR_TXT_MALLOCED       0x01

diff --git a/fips/fips.h b/fips/fips.h
index 5d8f626561f4906aafc7df07208ac5ad9ab9e786..e0a0247ba69ba30cd9ec0f196bfd422acbea87ee 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.
@@ -109,6 +110,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 *));