From f60fc19a6914ca4955e3381b1ab25e3523b5ffb2 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 26 Jan 2005 20:05:46 +0000 Subject: [PATCH] make update --- crypto/bf/Makefile | 7 +++++-- crypto/cast/Makefile | 6 ++++-- crypto/des/Makefile | 2 +- crypto/evp/Makefile | 10 +++++----- crypto/idea/Makefile | 3 +++ crypto/md2/Makefile | 4 +++- crypto/mdc2/Makefile | 6 ++++-- crypto/rc2/Makefile | 7 +++++-- crypto/rc5/Makefile | 6 +++++- crypto/sha/Makefile | 8 +++++++- fips/Makefile | 8 +------- fips/sha1/Makefile | 4 +--- util/libeay.num | 13 +++++++++++++ 13 files changed, 57 insertions(+), 27 deletions(-) diff --git a/crypto/bf/Makefile b/crypto/bf/Makefile index 7db480dc33..0e2121efdc 100644 --- a/crypto/bf/Makefile +++ b/crypto/bf/Makefile @@ -109,5 +109,8 @@ bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c -bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h -bf_skey.o: ../../include/openssl/opensslconf.h bf_locl.h bf_pi.h bf_skey.c +bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/crypto.h +bf_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h +bf_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h +bf_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +bf_skey.o: bf_locl.h bf_pi.h bf_skey.c diff --git a/crypto/cast/Makefile b/crypto/cast/Makefile index b7f88337d5..8b0d04bb7c 100644 --- a/crypto/cast/Makefile +++ b/crypto/cast/Makefile @@ -114,5 +114,7 @@ c_ofb64.o: ../../e_os.h ../../include/openssl/cast.h c_ofb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h c_ofb64.o: c_ofb64.c cast_lcl.h c_skey.o: ../../e_os.h ../../include/openssl/cast.h -c_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h -c_skey.o: c_skey.c cast_lcl.h cast_s.h +c_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +c_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +c_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +c_skey.o: ../../include/openssl/symhacks.h c_skey.c cast_lcl.h cast_s.h diff --git a/crypto/des/Makefile b/crypto/des/Makefile index d61188154b..655f2ea1a8 100644 --- a/crypto/des/Makefile +++ b/crypto/des/Makefile @@ -168,7 +168,7 @@ des_enc.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h des_enc.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h -des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h +des_enc.o: ../../include/openssl/ui_compat.h des_enc.c des_locl.h ncbc_enc.c des_old.o: ../../include/openssl/crypto.h ../../include/openssl/des.h des_old.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h des_old.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index d3996ab735..416cffdcfb 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -713,7 +713,7 @@ m_md2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h m_md2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h m_md2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h m_md2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_md2.o: ../cryptlib.h m_md2.c +m_md2.o: ../cryptlib.h evp_locl.h m_md2.c m_md4.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h m_md4.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h m_md4.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -734,7 +734,7 @@ m_md4.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h m_md4.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h m_md4.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h m_md4.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_md4.o: ../cryptlib.h m_md4.c +m_md4.o: ../cryptlib.h evp_locl.h m_md4.c m_md5.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h m_md5.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h m_md5.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -755,7 +755,7 @@ m_md5.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h m_md5.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h m_md5.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h m_md5.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_md5.o: ../cryptlib.h m_md5.c +m_md5.o: ../cryptlib.h evp_locl.h m_md5.c m_mdc2.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h m_mdc2.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h m_mdc2.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -776,7 +776,7 @@ m_mdc2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h m_mdc2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h m_mdc2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h m_mdc2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_mdc2.o: ../cryptlib.h m_mdc2.c +m_mdc2.o: ../cryptlib.h evp_locl.h m_mdc2.c m_null.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h m_null.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h m_null.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -840,7 +840,7 @@ m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h m_sha.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -m_sha.o: ../cryptlib.h m_sha.c +m_sha.o: ../cryptlib.h evp_locl.h m_sha.c m_sha1.o: ../../e_os.h ../../include/openssl/aes.h ../../include/openssl/asn1.h m_sha1.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h m_sha1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h diff --git a/crypto/idea/Makefile b/crypto/idea/Makefile index 86d9f12b22..f652783027 100644 --- a/crypto/idea/Makefile +++ b/crypto/idea/Makefile @@ -85,5 +85,8 @@ i_ecb.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h i_ecb.o: ../../include/openssl/opensslv.h i_ecb.c idea_lcl.h i_ofb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h i_ofb64.o: i_ofb64.c idea_lcl.h +i_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h i_skey.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h +i_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h +i_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h i_skey.o: i_skey.c idea_lcl.h diff --git a/crypto/md2/Makefile b/crypto/md2/Makefile index a9e016025a..90628511da 100644 --- a/crypto/md2/Makefile +++ b/crypto/md2/Makefile @@ -77,7 +77,9 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -md2_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +md2_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h +md2_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +md2_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h md2_dgst.o: ../../include/openssl/md2.h ../../include/openssl/opensslconf.h md2_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h md2_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h diff --git a/crypto/mdc2/Makefile b/crypto/mdc2/Makefile index 8763e76c3f..38c785bf95 100644 --- a/crypto/mdc2/Makefile +++ b/crypto/mdc2/Makefile @@ -87,8 +87,10 @@ mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h mdc2_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h mdc2_one.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h mdc2_one.o: ../cryptlib.h mdc2_one.c -mdc2dgst.o: ../../include/openssl/crypto.h ../../include/openssl/des.h -mdc2dgst.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h +mdc2dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h +mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h +mdc2dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +mdc2dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h mdc2dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h diff --git a/crypto/rc2/Makefile b/crypto/rc2/Makefile index 825f68b993..18edaca6c6 100644 --- a/crypto/rc2/Makefile +++ b/crypto/rc2/Makefile @@ -81,8 +81,11 @@ rc2_cbc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h rc2_cbc.o: rc2_cbc.c rc2_locl.h rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h -rc2_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h -rc2_skey.o: rc2_locl.h rc2_skey.c +rc2_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +rc2_skey.o: ../../include/openssl/opensslconf.h +rc2_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h +rc2_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +rc2_skey.o: ../../include/openssl/symhacks.h rc2_locl.h rc2_skey.c rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h rc2cfb64.o: rc2_locl.h rc2cfb64.c rc2ofb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h diff --git a/crypto/rc5/Makefile b/crypto/rc5/Makefile index 15588f5ad6..3a8d309b29 100644 --- a/crypto/rc5/Makefile +++ b/crypto/rc5/Makefile @@ -101,6 +101,10 @@ clean: rc5_ecb.o: ../../include/openssl/opensslv.h ../../include/openssl/rc5.h rc5_ecb.o: rc5_ecb.c rc5_locl.h rc5_enc.o: ../../include/openssl/rc5.h rc5_enc.c rc5_locl.h -rc5_skey.o: ../../include/openssl/rc5.h rc5_locl.h rc5_skey.c +rc5_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +rc5_skey.o: ../../include/openssl/opensslconf.h +rc5_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/rc5.h +rc5_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +rc5_skey.o: ../../include/openssl/symhacks.h rc5_locl.h rc5_skey.c rc5cfb64.o: ../../include/openssl/rc5.h rc5_locl.h rc5cfb64.c rc5ofb64.o: ../../include/openssl/rc5.h rc5_locl.h rc5ofb64.c diff --git a/crypto/sha/Makefile b/crypto/sha/Makefile index 395112762d..0426786aa0 100644 --- a/crypto/sha/Makefile +++ b/crypto/sha/Makefile @@ -104,8 +104,14 @@ sha1_one.o: ../../include/openssl/opensslconf.h sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h sha1_one.o: ../../include/openssl/sha.h ../../include/openssl/stack.h sha1_one.o: ../../include/openssl/symhacks.h sha1_one.c +sha1dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h +sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +sha1dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h sha1dgst.o: ../../include/openssl/opensslconf.h -sha1dgst.o: ../../include/openssl/opensslv.h sha1dgst.c +sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h +sha1dgst.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +sha1dgst.o: ../../include/openssl/symhacks.h ../md32_common.h sha1dgst.c +sha1dgst.o: sha_locl.h sha_dgst.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h sha_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h sha_dgst.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h diff --git a/fips/Makefile b/fips/Makefile index 43fc273f18..122e06d928 100644 --- a/fips/Makefile +++ b/fips/Makefile @@ -193,10 +193,4 @@ fips.o: ../include/openssl/safestack.h ../include/openssl/sha.h fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h fips.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h fips.c fips.o: fips_locl.h -fips_err_wrapper.o: ../include/openssl/bio.h ../include/openssl/crypto.h -fips_err_wrapper.o: ../include/openssl/e_os2.h ../include/openssl/err.h -fips_err_wrapper.o: ../include/openssl/fips.h ../include/openssl/lhash.h -fips_err_wrapper.o: ../include/openssl/opensslconf.h -fips_err_wrapper.o: ../include/openssl/opensslv.h -fips_err_wrapper.o: ../include/openssl/safestack.h ../include/openssl/stack.h -fips_err_wrapper.o: ../include/openssl/symhacks.h fips_err.h fips_err_wrapper.c +fips_err_wrapper.o: ../include/openssl/opensslconf.h fips_err_wrapper.c diff --git a/fips/sha1/Makefile b/fips/sha1/Makefile index 2ea1634c81..1fa25b32be 100644 --- a/fips/sha1/Makefile +++ b/fips/sha1/Makefile @@ -112,10 +112,8 @@ fips_sha1_selftest.o: ../../include/openssl/opensslv.h fips_sha1_selftest.o: ../../include/openssl/safestack.h fips_sha1_selftest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h fips_sha1_selftest.o: ../../include/openssl/symhacks.h fips_sha1_selftest.c -fips_sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/fips.h fips_sha1dgst.o: ../../include/openssl/opensslconf.h -fips_sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h -fips_sha1dgst.o: fips_md32_common.h fips_sha1dgst.c fips_sha_locl.h +fips_sha1dgst.o: ../../include/openssl/opensslv.h fips_sha1dgst.c fips_sha1test.o: ../../e_os.h ../../include/openssl/bio.h fips_sha1test.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h fips_sha1test.o: ../../include/openssl/err.h ../../include/openssl/fips.h diff --git a/util/libeay.num b/util/libeay.num index c9d1f95614..a6be820d77 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2842,3 +2842,16 @@ FIPS_mode 3283 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_selftest_failed 3284 EXIST:OPENSSL_FIPS:FUNCTION: sk_is_sorted 3285 EXIST::FUNCTION: X509_check_ca 3286 EXIST::FUNCTION: +private_idea_set_encrypt_key 3287 EXIST:OPENSSL_FIPS:FUNCTION:IDEA +HMAC_CTX_set_flags 3288 EXIST::FUNCTION:HMAC +private_SHA_Init 3289 EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA0 +private_CAST_set_key 3290 EXIST::FUNCTION:CAST +private_RIPEMD160_Init 3291 EXIST:OPENSSL_FIPS:FUNCTION:RIPEMD +private_RC5_32_set_key 3292 EXIST::FUNCTION:RC5 +private_MD5_Init 3293 EXIST:OPENSSL_FIPS:FUNCTION:MD5 +private_RC4_set_key 3294 EXIST:OPENSSL_FIPS:FUNCTION:RC4 +private_MDC2_Init 3295 EXIST:OPENSSL_FIPS:FUNCTION:MDC2 +private_RC2_set_key 3296 EXIST::FUNCTION:RC2 +private_MD4_Init 3297 EXIST:OPENSSL_FIPS:FUNCTION:MD4 +private_BF_set_key 3298 EXIST::FUNCTION:BF +private_MD2_Init 3299 EXIST:OPENSSL_FIPS:FUNCTION:MD2 -- 2.25.1