Commit 644ce07e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Move function prototype to fips.h

parent 17f121de

crypto/err/err.h

+0 −6
Original line number Diff line number Diff line
@@ -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

fips/fips.h

+5 −0
Original line number Diff line number Diff line
@@ -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 *));