generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move function prototype to fips.h

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-06-06 11:56:58 +00:00
parent 17f121de9d
commit 644ce07ecd
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/err/err.h
View File

@ -137,12 +137,6 @@ extern "C" {
#define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,NULL,0) #define ERR_PUT_error(a,b,c,d,e) ERR_put_error(a,b,c,NULL,0)
#endif #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> #include <errno.h>
#define ERR_TXT_MALLOCED 0x01 #define ERR_TXT_MALLOCED 0x01

5
fips/fips.h
View File

@ -48,6 +48,7 @@
*/ */
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#include <stdarg.h>
#ifndef OPENSSL_FIPS #ifndef OPENSSL_FIPS
#error FIPS is disabled. #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 (*add_cb)(int *pointer, int amount,
int type, const char *file, int line)); 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 FIPS_set_malloc_callbacks(
void *(*malloc_cb)(int num, const char *file, int line), void *(*malloc_cb)(int num, const char *file, int line),
void (*free_cb)(void *)); void (*free_cb)(void *));