From: Richard Levitte Date: Fri, 5 Sep 2003 13:41:04 +0000 (+0000) Subject: make update X-Git-Tag: BEN_FIPS_TEST_1~65 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f743ef233a402e9d56bbf996ed74d352d279dc3a;p=oweals%2Fopenssl.git make update --- diff --git a/TABLE b/TABLE index 9c79c4cc8a..82ee45c695 100644 --- a/TABLE +++ b/TABLE @@ -1502,7 +1502,7 @@ $arflags = *** debug-ben $cc = gcc -$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe +$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -Wall -Wshadow -Werror -pipe $unistd = $thread_cflag = (unknown) $sys_id = @@ -1527,7 +1527,7 @@ $arflags = *** debug-ben-debug $cc = gcc -$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe +$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -g3 -O2 -Wall -Wshadow -Werror -pipe $unistd = $thread_cflag = (unknown) $sys_id = @@ -1550,31 +1550,6 @@ $shared_extension = $ranlib = $arflags = -*** debug-ben-fips -$cc = gcc -$cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -O2 -pedantic -Wall -Wshadow -Werror -pipe -$unistd = -$thread_cflag = (unknown) -$sys_id = -$lflags = -$bn_ops = -$bn_obj = asm/bn86-elf.o asm/co86-elf.o -$des_obj = -$bf_obj = -$md5_obj = -$sha1_obj = -$cast_obj = -$rc4_obj = -$rmd160_obj = -$rc5_obj = -$dso_scheme = -$shared_target= -$shared_cflag = -$shared_ldflag = -$shared_extension = -$ranlib = -$arflags = - *** debug-ben-fips-debug $cc = gcc $cflags = -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DFIPS -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl index 37555715fd..a197893e92 100644 --- a/crypto/sha/Makefile.ssl +++ b/crypto/sha/Makefile.ssl @@ -102,14 +102,7 @@ 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 ../../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 +sha1dgst.o: ../../include/openssl/opensslv.h sha1dgst.c 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.ssl b/fips/Makefile.ssl index 48b6bff5bf..16af713bc0 100644 --- a/fips/Makefile.ssl +++ b/fips/Makefile.ssl @@ -152,12 +152,19 @@ dclean: # DO NOT DELETE THIS LINE -- make depend depends on it. -fips.o: ../include/openssl/crypto.h ../include/openssl/des.h -fips.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h +fips.o: ../include/openssl/bio.h ../include/openssl/crypto.h +fips.o: ../include/openssl/des.h ../include/openssl/des_old.h +fips.o: ../include/openssl/e_os2.h ../include/openssl/err.h fips.o: ../include/openssl/fips.h ../include/openssl/fips_rand.h -fips.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -fips.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h -fips.o: ../include/openssl/safestack.h ../include/openssl/stack.h -fips.o: ../include/openssl/symhacks.h ../include/openssl/ui.h -fips.o: ../include/openssl/ui_compat.h fips.c -fips_err_wrapper.o: fips_err_wrapper.c +fips.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h +fips.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +fips.o: ../include/openssl/rand.h ../include/openssl/safestack.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_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.c fips_err_wrapper.c diff --git a/fips/aes/Makefile.ssl b/fips/aes/Makefile.ssl index d5f5a1052a..f5be1f72bf 100644 --- a/fips/aes/Makefile.ssl +++ b/fips/aes/Makefile.ssl @@ -94,6 +94,15 @@ clean: fips_aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h fips_aes_core.o: ../../include/openssl/opensslconf.h fips_aes_core.c fips_aes_core.o: fips_aes_locl.h +fips_aes_selftest.o: ../../include/openssl/aes.h ../../include/openssl/bio.h +fips_aes_selftest.o: ../../include/openssl/crypto.h +fips_aes_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +fips_aes_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h +fips_aes_selftest.o: ../../include/openssl/opensslconf.h +fips_aes_selftest.o: ../../include/openssl/opensslv.h +fips_aes_selftest.o: ../../include/openssl/safestack.h +fips_aes_selftest.o: ../../include/openssl/stack.h +fips_aes_selftest.o: ../../include/openssl/symhacks.h fips_aes_selftest.c fips_aesavs.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h fips_aesavs.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h fips_aesavs.o: ../../include/openssl/bn.h ../../include/openssl/cast.h diff --git a/fips/des/Makefile.ssl b/fips/des/Makefile.ssl index acec984a26..3aa2f4a02b 100644 --- a/fips/des/Makefile.ssl +++ b/fips/des/Makefile.ssl @@ -110,3 +110,15 @@ fips_des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h fips_des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h fips_des_enc.o: ../../include/openssl/ui_compat.h fips_des_enc.c fips_des_enc.o: fips_des_locl.h +fips_des_selftest.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h +fips_des_selftest.o: ../../include/openssl/des.h +fips_des_selftest.o: ../../include/openssl/des_old.h +fips_des_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +fips_des_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h +fips_des_selftest.o: ../../include/openssl/opensslconf.h +fips_des_selftest.o: ../../include/openssl/opensslv.h +fips_des_selftest.o: ../../include/openssl/safestack.h +fips_des_selftest.o: ../../include/openssl/stack.h +fips_des_selftest.o: ../../include/openssl/symhacks.h +fips_des_selftest.o: ../../include/openssl/ui.h +fips_des_selftest.o: ../../include/openssl/ui_compat.h fips_des_selftest.c diff --git a/fips/dsa/Makefile.ssl b/fips/dsa/Makefile.ssl index 93a889c36f..3d68e1b619 100644 --- a/fips/dsa/Makefile.ssl +++ b/fips/dsa/Makefile.ssl @@ -96,6 +96,25 @@ clean: rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff # DO NOT DELETE THIS LINE -- make depend depends on it. +fips_dsa_gen.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h +fips_dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h +fips_dsa_gen.o: ../../include/openssl/bn.h ../../include/openssl/cast.h +fips_dsa_gen.o: ../../include/openssl/crypto.h ../../include/openssl/des.h +fips_dsa_gen.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h +fips_dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h +fips_dsa_gen.o: ../../include/openssl/evp.h ../../include/openssl/idea.h +fips_dsa_gen.o: ../../include/openssl/md2.h ../../include/openssl/md4.h +fips_dsa_gen.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h +fips_dsa_gen.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +fips_dsa_gen.o: ../../include/openssl/opensslconf.h +fips_dsa_gen.o: ../../include/openssl/opensslv.h +fips_dsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h +fips_dsa_gen.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h +fips_dsa_gen.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h +fips_dsa_gen.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h +fips_dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +fips_dsa_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h +fips_dsa_gen.o: ../../include/openssl/ui_compat.h fips_dsa_gen.c fips_dsa_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h fips_dsa_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h fips_dsa_ossl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h diff --git a/util/libeay.num b/util/libeay.num index 6ad7e914ec..0b9e1fb61e 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -2828,3 +2828,4 @@ EVP_rc5_32_12_16_cfb64 3269 EXIST::FUNCTION:RC5 EVP_des_cfb1 3270 EXIST::FUNCTION:DES AES_cfb1_encrypt 3271 EXIST::FUNCTION:AES EVP_des_ede3_cfb1 3272 EXIST::FUNCTION:DES +DES_ede3_cfb_encrypt 3273 EXIST::FUNCTION:DES