PR: 2202 (partial)

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

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

diff --git a/crypto/o_init.c b/crypto/o_init.c
index 2a5f5aac76c083ad9761b07f8c4ecb594677f97c..d767a90a5f4391c9a990fb87946e6d8cbd6cbdc3 100644 (file)
--- a/crypto/o_init.c
+++ b/crypto/o_init.c
@@ -58,11 +58,16 @@
 
 #include <e_os.h>
 #include <openssl/err.h>
 
 #include <e_os.h>
 #include <openssl/err.h>

+

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

+#ifdef OPENSSL_FIPS

 extern void int_ERR_lib_init(void);
 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 );
 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
 
 /* Perform any essential OpenSSL initialization operations.
  * Currently only sets FIPS callbacks

diff --git a/util/libeay.num b/util/libeay.num
index 21f4a8ff941c3e2416004a009fced4d923080ed6..dd4c87ea4a13023ce020d1621882f7343d8a82da 100755 (executable)
--- 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:
 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:
 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 93dd2510204357c4d859cb5a828d35226bec48fe..85337710a30867d5ed810c3de5e215197a71cfec 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -975,6 +975,8 @@ sub do_defs
        $platform{"SHA512_Final"} = "!VMSVAX";
        $platform{"SHA512"} = "!VMSVAX";
 
        $platform{"SHA512_Final"} = "!VMSVAX";
        $platform{"SHA512"} = "!VMSVAX";
 

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

        # Info we know about
 
        push @ret, map { $_."\\".&info_string($_,"EXIST",
        # Info we know about
 
        push @ret, map { $_."\\".&info_string($_,"EXIST",