From: Dr. Stephen Henson Date: Thu, 21 May 2015 15:33:35 +0000 (+0100) Subject: make update X-Git-Tag: OpenSSL_1_1_0-pre1~1070 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f2e19cb15e3d68c748ce3dc2b791be9a2fc14fd3;p=oweals%2Fopenssl.git make update Reviewed-by: Rich Salz --- diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index c23c39a1aa..1a65b46893 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -772,7 +772,8 @@ pmeth_lib.o: ../include/internal/cryptlib.h ../include/internal/evp_int.h pmeth_lib.o: pmeth_lib.c scrypt.o: ../../include/internal/numbers.h ../../include/openssl/asn1.h scrypt.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h -scrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/evp.h +scrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +scrypt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h scrypt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h scrypt.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h scrypt.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h diff --git a/test/Makefile b/test/Makefile index 86a251fa52..99b999a7ad 100644 --- a/test/Makefile +++ b/test/Makefile @@ -701,11 +701,11 @@ evp_test.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h evp_test.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h evp_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h evp_test.o: ../include/openssl/pem.h ../include/openssl/pem2.h -evp_test.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h -evp_test.o: ../include/openssl/sha.h ../include/openssl/stack.h -evp_test.o: ../include/openssl/symhacks.h ../include/openssl/x509.h -evp_test.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h -evp_test.o: evp_test.c +evp_test.o: ../include/openssl/pkcs12.h ../include/openssl/pkcs7.h +evp_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h +evp_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h +evp_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h +evp_test.o: ../include/openssl/x509v3.h evp_test.c exptest.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/bn.h exptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h exptest.o: ../include/openssl/err.h ../include/openssl/lhash.h diff --git a/util/libeay.num b/util/libeay.num index 9d0213c2cd..27460f0049 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4570,3 +4570,4 @@ PKCS5_v2_scrypt_keyivgen 4928 EXIST::FUNCTION: ASN1_INTEGER_get_uint64 4929 EXIST::FUNCTION: ASN1_INTEGER_set_uint64 4930 EXIST::FUNCTION: PKCS5_pbe2_set_scrypt 4931 EXIST::FUNCTION: +PKCS8_set0_pbe 4932 EXIST::FUNCTION: