diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-06-06 11:56:58 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-06-06 11:56:58 +0000 |
| commit | 644ce07ecdec4e1a547f142bccc250ef6fd8a0af (patch) | |
| tree | 49b9a68e44409401819615e4ae5ff0c13c081a25 | |
| parent | 17f121de9d1420f7b52695e0766c76ffa973c47d (diff) | |
| download | openssl-644ce07ecdec4e1a547f142bccc250ef6fd8a0af.tar.gz | |
Move function prototype to fips.h
| -rw-r--r-- | crypto/err/err.h | 6 | ||||
| -rw-r--r-- | fips/fips.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/crypto/err/err.h b/crypto/err/err.h index 3d71e4212e..974cc9cc6f 100644 --- 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 5d8f626561..e0a0247ba6 100644 --- 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 *)); |