From fd0ba77717c4fda075c9c9a6ff1e5975fdf76905 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 11 Dec 2014 23:33:10 +0000 Subject: [PATCH] make update Reviewed-by: Tim Hudson --- crypto/Makefile | 8 ++-- crypto/bn/Makefile | 6 +-- crypto/camellia/Makefile | 4 +- crypto/cms/Makefile | 90 ++++++++++++++++++++-------------------- crypto/pqueue/Makefile | 5 ++- crypto/ts/Makefile | 11 ++--- engines/ccgost/Makefile | 22 +++++----- ssl/Makefile | 2 +- test/Makefile | 7 +++- util/libeay.num | 68 +++++++++++++++--------------- 10 files changed, 115 insertions(+), 108 deletions(-) diff --git a/crypto/Makefile b/crypto/Makefile index 6a6ac32dbb..fafa418756 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -222,10 +222,10 @@ o_init.o: ../include/openssl/safestack.h ../include/openssl/stack.h o_init.o: ../include/openssl/symhacks.h o_init.c o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_str.o: o_str.c o_str.h -o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h -o_time.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -o_time.o: ../include/openssl/safestack.h ../include/openssl/stack.h -o_time.o: ../include/openssl/symhacks.h crypto.h o_time.c +o_time.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h +o_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +o_time.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h +o_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h o_time.c thr_id.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h thr_id.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h thr_id.o: ../include/openssl/err.h ../include/openssl/lhash.h diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile index f0548ed787..c53b189e25 100644 --- a/crypto/bn/Makefile +++ b/crypto/bn/Makefile @@ -212,11 +212,11 @@ bn_blind.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h bn_blind.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h bn_blind.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_blind.o: ../include/internal/bn_int.h bn_blind.c bn_lcl.h -bn_const.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bn_const.o: ../../include/openssl/opensslconf.h +bn_const.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h +bn_const.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h bn_const.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h bn_const.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -bn_const.o: ../../include/openssl/symhacks.h bn.h bn_const.c +bn_const.o: ../../include/openssl/symhacks.h bn_const.c bn_ctx.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h bn_ctx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h bn_ctx.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile index 5dfd696a9a..59230992a3 100644 --- a/crypto/camellia/Makefile +++ b/crypto/camellia/Makefile @@ -88,8 +88,8 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -camellia.o: ../../include/openssl/opensslconf.h camellia.c camellia.h -camellia.o: cmll_locl.h +camellia.o: ../../include/openssl/camellia.h +camellia.o: ../../include/openssl/opensslconf.h camellia.c cmll_locl.h cmll_cbc.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h cmll_cbc.o: ../../include/openssl/opensslconf.h cmll_cbc.c cmll_cfb.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h diff --git a/crypto/cms/Makefile b/crypto/cms/Makefile index 644fef399e..2e957c76bf 100644 --- a/crypto/cms/Makefile +++ b/crypto/cms/Makefile @@ -82,34 +82,34 @@ clean: cms_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_asn1.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_asn1.o: ../../include/openssl/opensslconf.h +cms_asn1.o: ../../include/openssl/cms.h ../../include/openssl/conf.h +cms_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +cms_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +cms_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/evp.h +cms_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cms_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h cms_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h cms_asn1.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h cms_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h cms_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h cms_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h cms_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_asn1.o: cms.h cms_asn1.c cms_lcl.h +cms_asn1.o: cms_asn1.c cms_lcl.h cms_att.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_att.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_att.o: cms.h cms_att.c cms_lcl.h +cms_att.o: ../../include/openssl/cms.h ../../include/openssl/conf.h +cms_att.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +cms_att.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +cms_att.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +cms_att.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +cms_att.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cms_att.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cms_att.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +cms_att.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +cms_att.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_att.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cms_att.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +cms_att.o: ../../include/openssl/x509v3.h cms_att.c cms_lcl.h cms_cd.o: ../../e_os.h ../../include/openssl/asn1.h cms_cd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h cms_cd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h @@ -206,18 +206,18 @@ cms_ess.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms_ess.o: ../../include/openssl/x509v3.h ../cryptlib.h cms_ess.c cms_lcl.h cms_io.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_io.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_io.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -cms_io.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -cms_io.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h -cms_io.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -cms_io.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h -cms_io.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -cms_io.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h -cms_io.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h -cms_io.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h -cms_io.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -cms_io.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h -cms_io.o: cms_io.c cms_lcl.h +cms_io.o: ../../include/openssl/cms.h ../../include/openssl/crypto.h +cms_io.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h +cms_io.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h +cms_io.o: ../../include/openssl/err.h ../../include/openssl/evp.h +cms_io.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +cms_io.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h +cms_io.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h +cms_io.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h +cms_io.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h +cms_io.o: ../../include/openssl/sha.h ../../include/openssl/stack.h +cms_io.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h +cms_io.o: ../../include/openssl/x509_vfy.h cms_io.c cms_lcl.h cms_kari.o: ../../e_os.h ../../include/openssl/aes.h cms_kari.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_kari.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h @@ -238,19 +238,19 @@ cms_kari.o: ../../include/openssl/x509v3.h ../asn1/asn1_locl.h ../cryptlib.h cms_kari.o: cms_kari.c cms_lcl.h cms_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -cms_lib.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -cms_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h -cms_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -cms_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h -cms_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -cms_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -cms_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -cms_lib.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h -cms_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h -cms_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -cms_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -cms_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -cms_lib.o: cms.h cms_lcl.h cms_lib.c +cms_lib.o: ../../include/openssl/cms.h ../../include/openssl/conf.h +cms_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h +cms_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h +cms_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h +cms_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +cms_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +cms_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +cms_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h +cms_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h +cms_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h +cms_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +cms_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +cms_lib.o: ../../include/openssl/x509v3.h cms_lcl.h cms_lib.c cms_pwri.o: ../../e_os.h ../../include/openssl/aes.h cms_pwri.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h cms_pwri.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h diff --git a/crypto/pqueue/Makefile b/crypto/pqueue/Makefile index fb36a0c876..3c2d33dd7f 100644 --- a/crypto/pqueue/Makefile +++ b/crypto/pqueue/Makefile @@ -79,5 +79,6 @@ pqueue.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h pqueue.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h pqueue.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h pqueue.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -pqueue.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -pqueue.o: ../../include/openssl/symhacks.h ../cryptlib.h pqueue.c pqueue.h +pqueue.o: ../../include/openssl/pqueue.h ../../include/openssl/safestack.h +pqueue.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +pqueue.o: ../cryptlib.h pqueue.c diff --git a/crypto/ts/Makefile b/crypto/ts/Makefile index c18234555b..32872a7bde 100644 --- a/crypto/ts/Makefile +++ b/crypto/ts/Makefile @@ -146,8 +146,9 @@ ts_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h ts_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h ts_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h ts_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -ts_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -ts_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h ts.h ts_lib.c +ts_lib.o: ../../include/openssl/ts.h ../../include/openssl/x509.h +ts_lib.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h +ts_lib.o: ../cryptlib.h ts_lib.c ts_req_print.o: ../../e_os.h ../../include/openssl/asn1.h ts_req_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h ts_req_print.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h @@ -196,9 +197,9 @@ ts_rsp_print.o: ../../include/openssl/opensslv.h ts_rsp_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h ts_rsp_print.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h ts_rsp_print.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -ts_rsp_print.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h -ts_rsp_print.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h -ts_rsp_print.o: ../cryptlib.h ts.h ts_rsp_print.c +ts_rsp_print.o: ../../include/openssl/symhacks.h ../../include/openssl/ts.h +ts_rsp_print.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h +ts_rsp_print.o: ../../include/openssl/x509v3.h ../cryptlib.h ts_rsp_print.c ts_rsp_sign.o: ../../e_os.h ../../include/openssl/asn1.h ts_rsp_sign.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h ts_rsp_sign.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h diff --git a/engines/ccgost/Makefile b/engines/ccgost/Makefile index 1dbd883e5c..bcb82e3707 100644 --- a/engines/ccgost/Makefile +++ b/engines/ccgost/Makefile @@ -131,9 +131,9 @@ gost94_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost94_keyx.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h gost94_keyx.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h gost94_keyx.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -gost94_keyx.o: ../../include/openssl/engine.h ../../include/openssl/evp.h -gost94_keyx.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost94_keyx.o: ../../include/openssl/objects.h +gost94_keyx.o: ../../include/openssl/engine.h ../../include/openssl/err.h +gost94_keyx.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +gost94_keyx.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h gost94_keyx.o: ../../include/openssl/opensslconf.h gost94_keyx.o: ../../include/openssl/opensslv.h gost94_keyx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h @@ -179,8 +179,9 @@ gost_crypt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost_crypt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_crypt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_crypt.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_crypt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_crypt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +gost_crypt.o: ../../include/openssl/err.h ../../include/openssl/evp.h +gost_crypt.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +gost_crypt.o: ../../include/openssl/objects.h gost_crypt.o: ../../include/openssl/opensslconf.h gost_crypt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_crypt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h @@ -247,9 +248,9 @@ gost_pmeth.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h gost_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h gost_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h gost_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h -gost_pmeth.o: ../../include/openssl/engine.h ../../include/openssl/evp.h -gost_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h -gost_pmeth.o: ../../include/openssl/objects.h +gost_pmeth.o: ../../include/openssl/engine.h ../../include/openssl/err.h +gost_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h +gost_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h gost_pmeth.o: ../../include/openssl/opensslconf.h gost_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h @@ -264,8 +265,9 @@ gost_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h gost_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h gost_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h gost_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h -gost_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h -gost_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h +gost_sign.o: ../../include/openssl/err.h ../../include/openssl/evp.h +gost_sign.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h +gost_sign.o: ../../include/openssl/objects.h gost_sign.o: ../../include/openssl/opensslconf.h gost_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h gost_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h diff --git a/ssl/Makefile b/ssl/Makefile index ebbdedc7f4..0a7a1a382d 100644 --- a/ssl/Makefile +++ b/ssl/Makefile @@ -242,7 +242,7 @@ d1_srtp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h d1_srtp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h d1_srtp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h d1_srtp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_srtp.c -d1_srtp.o: srtp.h ssl_locl.h +d1_srtp.o: ssl_locl.h d1_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h d1_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h d1_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h diff --git a/test/Makefile b/test/Makefile index 85ba59471e..2f5d205728 100644 --- a/test/Makefile +++ b/test/Makefile @@ -719,8 +719,11 @@ jpaketest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h jpaketest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h jpaketest.o: ../include/openssl/safestack.h ../include/openssl/stack.h jpaketest.o: ../include/openssl/symhacks.h jpaketest.c -md2test.o: ../e_os.h ../include/openssl/e_os2.h -md2test.o: ../include/openssl/opensslconf.h md2test.c +md2test.o: ../include/openssl/buffer.h ../include/openssl/crypto.h +md2test.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h +md2test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +md2test.o: ../include/openssl/safestack.h ../include/openssl/stack.h +md2test.o: ../include/openssl/symhacks.h md2test.c md4test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h md4test.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h md4test.o: ../include/openssl/evp.h ../include/openssl/md4.h diff --git a/util/libeay.num b/util/libeay.num index f29a327806..fa12145d0e 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -3676,7 +3676,7 @@ BN_X931_generate_prime_ex 4060 EXIST::FUNCTION: FIPS_selftest_check 4061 NOEXIST::FUNCTION: FIPS_rand_set_dt 4062 NOEXIST::FUNCTION: CRYPTO_dbg_pop_info 4063 NOEXIST::FUNCTION: -FIPS_dsa_free 4064 EXIST:OPENSSL_FIPS:FUNCTION:DSA +FIPS_dsa_free 4064 NOEXIST::FUNCTION: RSA_X931_derive_ex 4065 EXIST::FUNCTION:RSA FIPS_rsa_new 4066 NOEXIST::FUNCTION: FIPS_rand_bytes 4067 NOEXIST::FUNCTION: @@ -3685,9 +3685,9 @@ EVP_CIPHER_CTX_test_flags 4069 EXIST::FUNCTION: CRYPTO_malloc_debug_init 4070 NOEXIST::FUNCTION: CRYPTO_dbg_push_info 4071 NOEXIST::FUNCTION: FIPS_corrupt_rsa_keygen 4072 NOEXIST::FUNCTION: -FIPS_dh_new 4073 EXIST:OPENSSL_FIPS:FUNCTION:DH +FIPS_dh_new 4073 NOEXIST::FUNCTION: FIPS_corrupt_dsa_keygen 4074 NOEXIST::FUNCTION: -FIPS_dh_free 4075 EXIST:OPENSSL_FIPS:FUNCTION:DH +FIPS_dh_free 4075 NOEXIST::FUNCTION: fips_pkey_signature_test 4076 NOEXIST::FUNCTION: EVP_add_alg_module 4077 EXIST::FUNCTION: int_RAND_init_engine_callbacks 4078 NOEXIST::FUNCTION: @@ -3695,7 +3695,7 @@ int_EVP_CIPHER_set_engine_callbacks 4079 NOEXIST::FUNCTION: int_EVP_MD_init_engine_callbacks 4080 NOEXIST::FUNCTION: FIPS_rand_test_mode 4081 NOEXIST::FUNCTION: FIPS_rand_reset 4082 NOEXIST::FUNCTION: -FIPS_dsa_new 4083 EXIST:OPENSSL_FIPS:FUNCTION:DSA +FIPS_dsa_new 4083 NOEXIST::FUNCTION: int_RAND_set_callbacks 4084 NOEXIST::FUNCTION: BN_X931_derive_prime_ex 4085 EXIST::FUNCTION: int_ERR_lib_init 4086 NOEXIST::FUNCTION: @@ -4412,37 +4412,37 @@ 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 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA -FIPS_ecdsa_verify 4776 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +FIPS_ecdsa_verify_digest 4775 NOEXIST::FUNCTION: +FIPS_ecdsa_verify 4776 NOEXIST::FUNCTION: BN_security_bits 4777 EXIST::FUNCTION: -FIPS_ecdsa_verify_ctx 4778 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +FIPS_ecdsa_verify_ctx 4778 NOEXIST::FUNCTION: ASN1_SCTX_get_template 4779 EXIST::FUNCTION: EVP_PKEY_asn1_set_security_bits 4780 EXIST::FUNCTION: ASN1_SCTX_set_app_data 4781 EXIST::FUNCTION: ASN1_SCTX_free 4782 EXIST::FUNCTION: -FIPS_dsa_sign 4783 EXIST:OPENSSL_FIPS:FUNCTION:DSA +FIPS_dsa_sign 4783 NOEXIST::FUNCTION: DH_security_bits 4784 EXIST::FUNCTION:DH EVP_aes_128_wrap_pad 4785 EXIST::FUNCTION:AES EVP_aes_192_wrap_pad 4786 EXIST::FUNCTION:AES -FIPS_dsa_verify_digest 4787 EXIST:OPENSSL_FIPS:FUNCTION:DSA +FIPS_dsa_verify_digest 4787 NOEXIST::FUNCTION: ASN1_add_stable_module 4788 EXIST::FUNCTION: DSA_security_bits 4789 EXIST::FUNCTION:DSA ASN1_SCTX_get_item 4790 EXIST::FUNCTION: ASN1_SCTX_get_app_data 4791 EXIST::FUNCTION: -FIPS_dsa_sign_digest 4792 EXIST:OPENSSL_FIPS:FUNCTION:DSA +FIPS_dsa_sign_digest 4792 NOEXIST::FUNCTION: CRYPTO_128_unwrap_pad 4793 EXIST::FUNCTION: ASN1_str2mask 4794 EXIST::FUNCTION: EVP_aes_256_wrap_pad 4795 EXIST::FUNCTION:AES CRYPTO_128_wrap_pad 4796 EXIST::FUNCTION: -FIPS_ecdsa_sign_ctx 4797 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA -FIPS_ecdsa_sign_digest 4798 EXIST:OPENSSL_FIPS:FUNCTION:ECDSA +FIPS_ecdsa_sign_ctx 4797 NOEXIST::FUNCTION: +FIPS_ecdsa_sign_digest 4798 NOEXIST::FUNCTION: ASN1_SCTX_new 4799 EXIST::FUNCTION: BN_generate_dsa_nonce 4800 EXIST::FUNCTION: EVP_PKEY_security_bits 4801 EXIST::FUNCTION: BN_nist_mod_func 4802 EXIST::FUNCTION: ASN1_SCTX_get_flags 4803 EXIST::FUNCTION: -FIPS_dsa_verify 4804 EXIST:OPENSSL_FIPS:FUNCTION:DSA -FIPS_dsa_verify_ctx 4805 EXIST:OPENSSL_FIPS:FUNCTION:DSA +FIPS_dsa_verify 4804 NOEXIST::FUNCTION: +FIPS_dsa_verify_ctx 4805 NOEXIST::FUNCTION: FIPS_selftest 4806 NOEXIST::FUNCTION: FIPS_set_error_callbacks 4807 NOEXIST::FUNCTION: FIPS_drbg_set_check_interval 4808 NOEXIST::FUNCTION: @@ -4512,8 +4512,8 @@ FIPS_rsa_verify_ctx 4871 NOEXIST::FUNCTION: RSA_check_key_ex 4872 EXIST::FUNCTION:RSA i2s_ASN1_IA5STRING 4874 EXIST::FUNCTION: s2i_ASN1_IA5STRING 4875 EXIST::FUNCTION: -FIPS_dsa_sign_ctx 4876 EXIST:OPENSSL_FIPS:FUNCTION:DSA -CRYPTO_ocb128_release 4878 EXIST::FUNCTION: +FIPS_dsa_sign_ctx 4876 NOEXIST::FUNCTION: +CRYPTO_ocb128_release 4878 NOEXIST::FUNCTION: CRYPTO_ocb128_new 4879 EXIST::FUNCTION: CRYPTO_ocb128_finish 4880 EXIST::FUNCTION: EVP_aes_256_ocb 4881 EXIST::FUNCTION:AES @@ -4525,21 +4525,21 @@ EVP_aes_192_ocb 4886 EXIST::FUNCTION:AES EVP_aes_128_ocb 4887 EXIST::FUNCTION:AES CRYPTO_ocb128_init 4888 EXIST::FUNCTION: CRYPTO_ocb128_encrypt 4889 EXIST::FUNCTION: -bn_wexpand 4878 NOEXIST::FUNCTION: -BN_zero_ex 4879 EXIST::FUNCTION: -BN_is_zero 4880 EXIST::FUNCTION: -BN_with_flags 4881 EXIST::FUNCTION: -BN_abs_is_word 4882 EXIST::FUNCTION: -bn_correct_top 4883 NOEXIST::FUNCTION: -BN_to_montgomery 4884 EXIST::FUNCTION: -BN_GENCB_new 4885 EXIST::FUNCTION: -BN_is_odd 4886 EXIST::FUNCTION: -BN_is_negative 4887 EXIST::FUNCTION: -BN_GENCB_get_arg 4888 EXIST::FUNCTION: -BN_GENCB_set 4889 EXIST::FUNCTION: -BN_is_word 4890 EXIST::FUNCTION: -BN_set_flags 4891 EXIST::FUNCTION: -BN_is_one 4892 EXIST::FUNCTION: -BN_GENCB_set_old 4893 EXIST::FUNCTION: -BN_GENCB_free 4894 EXIST::FUNCTION: -BN_get_flags 4895 EXIST::FUNCTION: +CRYPTO_ocb128_copy_ctx 4890 EXIST::FUNCTION: +BN_is_word 4891 EXIST::FUNCTION: +BN_GENCB_set 4892 EXIST::FUNCTION: +CRYPTO_ocb128_cleanup 4893 EXIST::FUNCTION: +BN_GENCB_set_old 4894 EXIST::FUNCTION: +BN_is_zero 4895 EXIST::FUNCTION: +BN_with_flags 4896 EXIST::FUNCTION: +BN_GENCB_new 4897 EXIST::FUNCTION: +BN_to_montgomery 4898 EXIST::FUNCTION: +BN_GENCB_free 4899 EXIST::FUNCTION: +BN_is_negative 4900 EXIST::FUNCTION: +BN_get_flags 4901 EXIST::FUNCTION: +BN_is_one 4902 EXIST::FUNCTION: +BN_abs_is_word 4903 EXIST::FUNCTION: +BN_GENCB_get_arg 4904 EXIST::FUNCTION: +BN_zero_ex 4905 EXIST::FUNCTION: +BN_is_odd 4906 EXIST::FUNCTION: +BN_set_flags 4907 EXIST::FUNCTION: -- 2.34.1