make update

diff --git a/crypto/engine/Makefile.ssl b/crypto/engine/Makefile.ssl
index a9a50716d08e224d5785a81fe77f80deb853e90b..ec8f225172558f0ccd84fb51ccdb58445e2e0dd0 100644 (file)
--- a/crypto/engine/Makefile.ssl
+++ b/crypto/engine/Makefile.ssl
@@ -325,6 +325,28 @@ hw_atalla.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 hw_atalla.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 hw_atalla.o: ../cryptlib.h hw_atalla.c hw_atalla_err.c hw_atalla_err.h
 hw_atalla.o: vendor_defns/atalla.h
+hw_cryptodev.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+hw_cryptodev.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+hw_cryptodev.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
+hw_cryptodev.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+hw_cryptodev.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
+hw_cryptodev.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
+hw_cryptodev.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+hw_cryptodev.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+hw_cryptodev.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+hw_cryptodev.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
+hw_cryptodev.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
+hw_cryptodev.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
+hw_cryptodev.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+hw_cryptodev.o: ../../include/openssl/opensslconf.h
+hw_cryptodev.o: ../../include/openssl/opensslv.h
+hw_cryptodev.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
+hw_cryptodev.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
+hw_cryptodev.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
+hw_cryptodev.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+hw_cryptodev.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+hw_cryptodev.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+hw_cryptodev.o: ../../include/openssl/ui_compat.h hw_cryptodev.c
 hw_cswift.o: ../../e_os.h ../../include/openssl/asn1.h
 hw_cswift.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 hw_cswift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -381,48 +403,6 @@ hw_nuron.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
 hw_nuron.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 hw_nuron.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 hw_nuron.o: ../cryptlib.h hw_nuron.c hw_nuron_err.c hw_nuron_err.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/aes.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/asn1.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/bio.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/blowfish.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/bn.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/cast.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/conf.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/crypto.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/des.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/des_old.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/e_os2.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/ec.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/ecdh.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/ecdsa.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/engine.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/err.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/evp.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/idea.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/lhash.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/md2.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/md4.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/md5.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/mdc2.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/obj_mac.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/objects.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/opensslconf.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/opensslv.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/ossl_typ.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/rand.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/rc2.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/rc4.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/rc5.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/ripemd.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/rsa.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/safestack.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/sha.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/stack.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/symhacks.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/ui.h
-hw_openbsd_dev_crypto.o: ../../include/openssl/ui_compat.h ../evp/evp_locl.h
-hw_openbsd_dev_crypto.o: eng_int.h hw_openbsd_dev_crypto.c
 hw_sureware.o: ../../e_os.h ../../include/openssl/aes.h
 hw_sureware.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 hw_sureware.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

diff --git a/util/libeay.num b/util/libeay.num
index 3b2b6048dbb2b8c72d0b1878a8df3c5d0feba217..d73803d232b3db9943eabfc7e5567b3464f56a6c 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3010,3 +3010,13 @@ X509_REQ_print_ex                       3443     EXIST::FUNCTION:BIO
 EC_GROUP_get_pentanomial_basis          3444   EXIST::FUNCTION:EC
 EC_GROUP_get_trinomial_basis            3445   EXIST::FUNCTION:EC
 EC_get_builtin_curves                   3446   EXIST::FUNCTION:EC
+PKCS12_add_safe                         3447   EXIST::FUNCTION:
+PKCS12_add_safes                        3448   EXIST::FUNCTION:
+X509_keyid_get0                         3449   EXIST::FUNCTION:
+ASN1_OCTET_STRING_NDEF_it               3450   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
+ASN1_OCTET_STRING_NDEF_it               3450   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
+ASN1_put_eoc                            3451   EXIST::FUNCTION:
+PKCS12_add_key                          3452   EXIST::FUNCTION:
+PKCS12_add_cert                         3453   EXIST::FUNCTION:
+ASN1_item_ndef_i2d                      3454   EXIST::FUNCTION:
+d2i_PKCS7_NDEF                          3455   EXIST::FUNCTION: