From: Dr. Stephen Henson Date: Wed, 3 Jun 2015 14:37:39 +0000 (+0100) Subject: make update. X-Git-Tag: OpenSSL_1_1_0-pre1~1037 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97cacc537eba474d27dea0f96796b3b754e60034;p=openssl make update. Make update with manual edit so EVP_PKEY_asn1_set_item uses the same ordinal as 1.0.2. Reviewed-by: Matt Caswell --- diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile index 7d55778d36..8875c4111b 100644 --- a/crypto/bn/Makefile +++ b/crypto/bn/Makefile @@ -247,7 +247,7 @@ bn_exp.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h bn_exp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h bn_exp.o: ../../include/openssl/symhacks.h ../include/internal/bn_int.h -bn_exp.o: ../include/internal/cryptlib.h bn_exp.c bn_lcl.h rsaz_exp.h +bn_exp.o: ../include/internal/cryptlib.h bn_exp.c bn_lcl.h bn_exp2.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h bn_exp2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h diff --git a/util/libeay.num b/util/libeay.num index 27460f0049..c297ef789d 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4414,8 +4414,8 @@ ECDSA_METHOD_get_app_data 4770 EXIST::FUNCTION:EC X509_VERIFY_PARAM_add1_host 4771 EXIST::FUNCTION: EC_GROUP_get_mont_data 4772 EXIST::FUNCTION:EC i2d_re_X509_tbs 4773 EXIST::FUNCTION: -RSA_security_bits 4774 EXIST::FUNCTION:RSA -FIPS_ecdsa_verify_digest 4775 NOEXIST::FUNCTION: +EVP_PKEY_asn1_set_item 4774 EXIST::FUNCTION: +RSA_security_bits 4775 EXIST::FUNCTION:RSA FIPS_ecdsa_verify 4776 NOEXIST::FUNCTION: BN_security_bits 4777 EXIST::FUNCTION: FIPS_ecdsa_verify_ctx 4778 NOEXIST::FUNCTION: