From f39175020533331a1a29472719994db4bb2a162a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodo=20M=C3=B6ller?= Date: Wed, 19 Oct 2011 15:29:14 +0000 Subject: [PATCH] "make update" (partial) --- engines/Makefile | 15 ++++++++------- test/Makefile | 16 ++++++++-------- util/libeay.num | 6 ++++-- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/engines/Makefile b/engines/Makefile index 190d4a1cdd..786716c11b 100644 --- a/engines/Makefile +++ b/engines/Makefile @@ -301,13 +301,14 @@ e_padlock.o: ../include/openssl/e_os2.h ../include/openssl/ec.h e_padlock.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h e_padlock.o: ../include/openssl/engine.h ../include/openssl/err.h e_padlock.o: ../include/openssl/evp.h ../include/openssl/lhash.h -e_padlock.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -e_padlock.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -e_padlock.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h -e_padlock.o: ../include/openssl/rand.h ../include/openssl/safestack.h -e_padlock.o: ../include/openssl/sha.h ../include/openssl/stack.h -e_padlock.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -e_padlock.o: ../include/openssl/x509_vfy.h e_padlock.c +e_padlock.o: ../include/openssl/modes.h ../include/openssl/obj_mac.h +e_padlock.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +e_padlock.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +e_padlock.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h +e_padlock.o: ../include/openssl/safestack.h ../include/openssl/sha.h +e_padlock.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +e_padlock.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +e_padlock.o: e_padlock.c e_sureware.o: ../include/openssl/asn1.h ../include/openssl/bio.h e_sureware.o: ../include/openssl/bn.h ../include/openssl/buffer.h e_sureware.o: ../include/openssl/crypto.h ../include/openssl/dh.h diff --git a/test/Makefile b/test/Makefile index 5eb7e31cae..2577d245b9 100644 --- a/test/Makefile +++ b/test/Makefile @@ -756,14 +756,14 @@ fips_hmactest.o: ../include/openssl/symhacks.h fips_hmactest.c fips_randtest.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h fips_randtest.o: ../include/openssl/bio.h ../include/openssl/bn.h fips_randtest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -fips_randtest.o: ../include/openssl/err.h ../include/openssl/evp.h -fips_randtest.o: ../include/openssl/fips_rand.h ../include/openssl/hmac.h -fips_randtest.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h -fips_randtest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -fips_randtest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -fips_randtest.o: ../include/openssl/rand.h ../include/openssl/safestack.h -fips_randtest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -fips_randtest.o: fips_randtest.c +fips_randtest.o: ../include/openssl/ec.h ../include/openssl/err.h +fips_randtest.o: ../include/openssl/evp.h ../include/openssl/fips_rand.h +fips_randtest.o: ../include/openssl/hmac.h ../include/openssl/lhash.h +fips_randtest.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +fips_randtest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +fips_randtest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h +fips_randtest.o: ../include/openssl/safestack.h ../include/openssl/stack.h +fips_randtest.o: ../include/openssl/symhacks.h fips_randtest.c fips_rngvs.o: ../include/openssl/opensslconf.h fips_rngvs.c fips_rsagtest.o: ../include/openssl/asn1.h ../include/openssl/bio.h fips_rsagtest.o: ../include/openssl/bn.h ../include/openssl/crypto.h diff --git a/util/libeay.num b/util/libeay.num index dac48db113..6f8714de55 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4218,7 +4218,7 @@ EVP_PKEY_meth_copy 4588 EXIST::FUNCTION: ERR_add_error_vdata 4589 EXIST::FUNCTION: EVP_aes_128_ctr 4590 EXIST::FUNCTION:AES EVP_aes_256_ctr 4591 EXIST::FUNCTION:AES -EC_GFp_nistp224_method 4592 EXIST:!WIN32:FUNCTION:EC,EC_NISTP224_64_GCC_128 +EC_GFp_nistp224_method 4592 EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128 EC_KEY_get_flags 4593 EXIST::FUNCTION:EC RSA_padding_add_PKCS1_PSS_mgf1 4594 EXIST::FUNCTION:RSA EVP_aes_128_xts 4595 EXIST::FUNCTION:AES @@ -4326,7 +4326,7 @@ X509_VERIFY_PARAM_get_count 4695 EXIST::FUNCTION: FIPS_rand_strength 4696 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_module_mode_set 4697 EXIST:OPENSSL_FIPS:FUNCTION: fips_check_rsa_prng 4698 EXIST:OPENSSL_FIPS:FUNCTION: -ENGINE_load_aesni 4699 EXIST::FUNCTION:ENGINE +ENGINE_load_aesni 4699 NOEXIST::FUNCTION: DH_compute_key_padded 4700 EXIST::FUNCTION:DH FIPS_x931_stick 4701 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_drbg_stick 4702 EXIST:OPENSSL_FIPS:FUNCTION: @@ -4386,3 +4386,5 @@ BN_nist_mod_func 4755 EXIST::FUNCTION: FIPS_drbg_get_app_data 4756 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_rsa_verify_ctx 4757 EXIST:OPENSSL_FIPS:FUNCTION: FIPS_drbg_method 4758 EXIST:OPENSSL_FIPS:FUNCTION: +EC_GFp_nistp521_method 4759 EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128 +EC_GFp_nistp256_method 4760 EXIST:!WIN32:FUNCTION:EC,EC_NISTP_64_GCC_128