From ea5b3f5e6256c2f65931fb9e3ab9734a90ac06ab Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 25 Mar 2010 12:17:17 +0000 Subject: [PATCH] PR: 2202 (partial) Submitted by: Steven M. Schweda Make some declarations conditional on FIPS/ENGINE. Make pqueue_print non-VAX. --- crypto/o_init.c | 5 +++++ util/libeay.num | 2 +- util/mkdef.pl | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/crypto/o_init.c b/crypto/o_init.c index 2a5f5aac76..d767a90a5f 100644 --- a/crypto/o_init.c +++ b/crypto/o_init.c @@ -58,11 +58,16 @@ #include #include + /* 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 diff --git a/util/libeay.num b/util/libeay.num index 21f4a8ff94..dd4c87ea4a 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -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: diff --git a/util/mkdef.pl b/util/mkdef.pl index 93dd251020..85337710a3 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -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", -- 2.25.1