diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-05-20 13:32:19 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-20 14:01:19 +0100 |
| commit | 5a1d2509060da8ca99fa41135eff7bf3a193f69f (patch) | |
| tree | 37e33197ef32b67401aa5091fa432245cdeaf450 | |
| parent | 3b53e18a4ff9ceddbcf3480afd1e787983038e2b (diff) | |
make update
Reviewed-by: Emilia Käsper <emilia@openssl.org>
| -rw-r--r-- | crypto/evp/Makefile | 8 | ||||
| -rw-r--r-- | test/Makefile | 29 | ||||
| -rwxr-xr-x | util/libeay.num | 5 |
3 files changed, 28 insertions, 14 deletions
diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index 81ac1c2d7c..9cd98cdb8b 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -768,3 +768,11 @@ pmeth_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h pmeth_lib.o: ../../include/openssl/x509_vfy.h ../include/internal/asn1_int.h 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/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 +scrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +scrypt.o: scrypt.c diff --git a/test/Makefile b/test/Makefile index 691249b24d..da97db784c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -690,20 +690,21 @@ evp_extra_test.o: ../include/openssl/safestack.h ../include/openssl/sha.h evp_extra_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h evp_extra_test.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h evp_extra_test.o: evp_extra_test.c -evp_test.o: ../include/openssl/asn1.h ../include/openssl/bio.h -evp_test.o: ../include/openssl/buffer.h ../include/openssl/conf.h -evp_test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h -evp_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -evp_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -evp_test.o: ../include/openssl/evp.h ../include/openssl/lhash.h -evp_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -evp_test.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -evp_test.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -evp_test.o: ../include/openssl/pem2.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 +evp_test.o: ../include/internal/numbers.h ../include/openssl/asn1.h +evp_test.o: ../include/openssl/bio.h ../include/openssl/buffer.h +evp_test.o: ../include/openssl/conf.h ../include/openssl/crypto.h +evp_test.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +evp_test.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +evp_test.o: ../include/openssl/err.h ../include/openssl/evp.h +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 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 d41686fea4..1225f8cca3 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4561,3 +4561,8 @@ COMP_CTX_get_method 4919 EXIST::FUNCTION: COMP_CTX_get_type 4920 EXIST::FUNCTION: COMP_get_name 4921 EXIST::FUNCTION: COMP_get_type 4922 EXIST::FUNCTION: +ASN1_INTEGER_get_int64 4923 EXIST::FUNCTION: +ASN1_ENUMERATED_set_int64 4924 EXIST::FUNCTION: +EVP_PBE_scrypt 4925 EXIST::FUNCTION: +ASN1_INTEGER_set_int64 4926 EXIST::FUNCTION: +ASN1_ENUMERATED_get_int64 4927 EXIST::FUNCTION: |