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

PR: 2202 (partial) 

Submitted by: Steven M. Schweda <sms@antinode.info>

Make some declarations conditional on FIPS/ENGINE.
Make pqueue_print non-VAX.
parent c3c658e1

crypto/o_init.c

+5 −0
Original line number Diff line number Diff line
@@ -58,11 +58,16 @@ 


#include <e_os.h>

#include <openssl/err.h>



/* Internal only functions: only ever used here */

#ifdef OPENSSL_FIPS

extern	void int_ERR_lib_init(void);

# ifndef OPENSSL_NO_ENGINE

extern	void int_EVP_MD_init_engine_callbacks(void );

extern	void int_EVP_CIPHER_init_engine_callbacks(void );

extern	void int_RAND_init_engine_callbacks(void );

# endif

#endif



/* Perform any essential OpenSSL initialization operations.

 * Currently only sets FIPS callbacks

util/libeay.num

+1 −1
Original line number Diff line number Diff line
@@ -2996,7 +2996,7 @@ STORE_method_get_generate_function 3426 EXIST:!VMS:FUNCTION: 
STORE_meth_get_generate_fn              3426	EXIST:VMS:FUNCTION:

STORE_method_set_list_end_function      3427	EXIST:!VMS:FUNCTION:

STORE_meth_set_list_end_fn              3427	EXIST:VMS:FUNCTION:

pqueue_print                            3428	EXIST::FUNCTION:

pqueue_print                            3428	EXIST:!VMSVAX:FUNCTION:

EC_GROUP_have_precompute_mult           3429	EXIST::FUNCTION:EC

EC_KEY_print_fp                         3430	EXIST::FUNCTION:EC,FP_API

BN_GF2m_mod_arr                         3431	EXIST::FUNCTION:

util/mkdef.pl

+2 −0
Original line number Diff line number Diff line
@@ -975,6 +975,8 @@ sub do_defs 
	$platform{"SHA512_Final"} = "!VMSVAX";

	$platform{"SHA512"} = "!VMSVAX";



	$platform{"pqueue_print"} = "!VMSVAX";



	# Info we know about



	push @ret, map { $_."\\".&info_string($_,"EXIST",