make update
authorDr. Stephen Henson <steve@openssl.org>
Wed, 20 May 2015 21:27:22 +0000 (22:27 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 21 May 2015 11:48:03 +0000 (12:48 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
crypto/asn1/Makefile
util/libeay.num

index cfa30dd..4dee260 100644 (file)
@@ -150,7 +150,8 @@ a_i2d_fp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 a_i2d_fp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 a_i2d_fp.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
 a_i2d_fp.o: a_i2d_fp.c
-a_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
+a_int.o: ../../e_os.h ../../include/internal/numbers.h
+a_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 a_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 a_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 a_int.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
@@ -528,6 +529,21 @@ p5_pbev2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 p5_pbev2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 p5_pbev2.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 p5_pbev2.o: ../include/internal/cryptlib.h p5_pbev2.c
+p5_scrypt.o: ../../e_os.h ../../include/openssl/asn1.h
+p5_scrypt.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+p5_scrypt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+p5_scrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+p5_scrypt.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+p5_scrypt.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+p5_scrypt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+p5_scrypt.o: ../../include/openssl/objects.h
+p5_scrypt.o: ../../include/openssl/opensslconf.h
+p5_scrypt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+p5_scrypt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+p5_scrypt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+p5_scrypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+p5_scrypt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+p5_scrypt.o: ../include/internal/cryptlib.h p5_scrypt.c
 p8_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
 p8_pkey.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 p8_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
index 1225f8c..9d0213c 100755 (executable)
@@ -4566,3 +4566,7 @@ 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:
+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: