"make update"

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 11b629711a01a0029ee1c740fe42f6390ae1aebc..8363ec901823be01ec37302fa271d0882f39e4da 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -209,11 +209,12 @@ ciphers.o: progs.h
 crl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 crl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 crl.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 crl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 crl.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 crl.o: ../include/openssl/buffer.h ../include/openssl/cast.h

-crl.o: ../include/openssl/crypto.h ../include/openssl/des.h
-crl.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-crl.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-crl.o: ../include/openssl/err.h ../include/openssl/evp.h
-crl.o: ../include/openssl/idea.h ../include/openssl/md2.h
+crl.o: ../include/openssl/conf.h ../include/openssl/crypto.h
+crl.o: ../include/openssl/des.h ../include/openssl/dh.h
+crl.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+crl.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+crl.o: ../include/openssl/evp.h ../include/openssl/idea.h
+crl.o: ../include/openssl/lhash.h ../include/openssl/md2.h

 crl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 crl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 crl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 crl.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 crl.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 crl.o: ../include/openssl/opensslv.h ../include/openssl/pem.h


@@ -708,11 +709,12 @@ version.o: ../include/openssl/sha.h ../include/openssl/stack.h apps.h progs.h
 x509.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 x509.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 x509.o: ../include/openssl/buffer.h ../include/openssl/cast.h
 x509.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 x509.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 x509.o: ../include/openssl/buffer.h ../include/openssl/cast.h

-x509.o: ../include/openssl/crypto.h ../include/openssl/des.h
-x509.o: ../include/openssl/dh.h ../include/openssl/dsa.h
-x509.o: ../include/openssl/e_os.h ../include/openssl/e_os2.h
-x509.o: ../include/openssl/err.h ../include/openssl/evp.h
-x509.o: ../include/openssl/idea.h ../include/openssl/md2.h
+x509.o: ../include/openssl/conf.h ../include/openssl/crypto.h
+x509.o: ../include/openssl/des.h ../include/openssl/dh.h
+x509.o: ../include/openssl/dsa.h ../include/openssl/e_os.h
+x509.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+x509.o: ../include/openssl/evp.h ../include/openssl/idea.h
+x509.o: ../include/openssl/lhash.h ../include/openssl/md2.h

 x509.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 x509.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 x509.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
 x509.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
 x509.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 x509.o: ../include/openssl/opensslv.h ../include/openssl/pem.h

diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl
index 658e4231baed4acd6c5560e52a3a680b1684bd15..ec8157a4fb9488f87cd88848416f11ec1394e72f 100644 (file)
--- a/crypto/asn1/Makefile.ssl
+++ b/crypto/asn1/Makefile.ssl
@@ -1050,11 +1050,12 @@ p8_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h
 t_crl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 t_crl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 t_crl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
 t_crl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 t_crl.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 t_crl.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

-t_crl.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-t_crl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-t_crl.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-t_crl.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-t_crl.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+t_crl.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+t_crl.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+t_crl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+t_crl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+t_crl.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+t_crl.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

 t_crl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 t_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 t_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 t_crl.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 t_crl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 t_crl.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h


@@ -1091,11 +1092,12 @@ t_req.o: ../cryptlib.h
 t_x509.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 t_x509.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 t_x509.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
 t_x509.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 t_x509.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 t_x509.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

-t_x509.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-t_x509.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-t_x509.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-t_x509.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-t_x509.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+t_x509.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+t_x509.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+t_x509.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+t_x509.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+t_x509.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+t_x509.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

 t_x509.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 t_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 t_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 t_x509.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 t_x509.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 t_x509.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index ab2e148be1884a7da90c62e009babc0fd6b4f269..64b763f0688168decb95fee8fe1de08ee0043ba8 100644 (file)
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -84,8 +84,9 @@ conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
 conf.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
 conf.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 conf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 conf.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
 conf.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 conf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

-conf.o: ../../include/openssl/stack.h ../cryptlib.h conf_lcl.h
+conf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+conf.o: ../cryptlib.h conf_lcl.h

 conf_err.o: ../../include/openssl/bio.h ../../include/openssl/conf.h
 conf_err.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
 conf_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h
 conf_err.o: ../../include/openssl/bio.h ../../include/openssl/conf.h
 conf_err.o: ../../include/openssl/crypto.h ../../include/openssl/err.h
 conf_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslv.h

-conf_err.o: ../../include/openssl/stack.h
+conf_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl
index 48940fb917c6bbd1adbf9a348ce123af37233824..70de9b43dddeebae7cd77d120633a2dbafacb6be 100644 (file)
--- a/crypto/x509v3/Makefile.ssl
+++ b/crypto/x509v3/Makefile.ssl
@@ -215,11 +215,12 @@ v3_crld.o: ../cryptlib.h
 v3_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_enum.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_enum.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
 v3_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_enum.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_enum.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

-v3_enum.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-v3_enum.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-v3_enum.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-v3_enum.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-v3_enum.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+v3_enum.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+v3_enum.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+v3_enum.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+v3_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+v3_enum.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+v3_enum.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

 v3_enum.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 v3_enum.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_enum.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 v3_enum.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h


@@ -287,11 +288,12 @@ v3_ia5.o: ../../include/openssl/x509v3.h ../cryptlib.h
 v3_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_int.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_int.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
 v3_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_int.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_int.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

-v3_int.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-v3_int.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-v3_int.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-v3_int.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-v3_int.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+v3_int.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+v3_int.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+v3_int.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+v3_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+v3_int.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+v3_int.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

 v3_int.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 v3_int.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_int.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_int.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 v3_int.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_int.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h


@@ -322,11 +324,12 @@ v3_lib.o: ../../include/openssl/x509v3.h ../cryptlib.h
 v3_pku.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 v3_pku.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 v3_pku.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 v3_pku.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h
 v3_pku.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 v3_pku.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

-v3_pku.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-v3_pku.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-v3_pku.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
-v3_pku.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-v3_pku.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+v3_pku.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+v3_pku.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+v3_pku.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+v3_pku.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+v3_pku.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+v3_pku.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h

 v3_pku.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
 v3_pku.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 v3_pku.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 v3_pku.o: ../../include/openssl/md2.h ../../include/openssl/md5.h
 v3_pku.o: ../../include/openssl/mdc2.h ../../include/openssl/objects.h
 v3_pku.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h


@@ -358,11 +361,12 @@ v3_prn.o: ../../include/openssl/x509v3.h ../cryptlib.h
 v3_skey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_skey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
 v3_skey.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_skey.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

-v3_skey.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-v3_skey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-v3_skey.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
-v3_skey.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-v3_skey.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+v3_skey.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+v3_skey.o: ../../include/openssl/des.h ../../include/openssl/dh.h
+v3_skey.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h
+v3_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+v3_skey.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+v3_skey.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

 v3_skey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 v3_skey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3_skey.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 v3_skey.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h


@@ -411,11 +415,12 @@ v3_utl.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 v3_utl.o: ../../include/openssl/x509v3.h ../cryptlib.h
 v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
 v3_utl.o: ../../include/openssl/x509v3.h ../cryptlib.h
 v3err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 v3err.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

-v3err.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-v3err.o: ../../include/openssl/des.h ../../include/openssl/dh.h
-v3err.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-v3err.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-v3err.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+v3err.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
+v3err.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+v3err.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
+v3err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+v3err.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+v3err.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

 v3err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 v3err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
 v3err.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
 v3err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 v3err.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

diff --git a/util/libeay.num b/util/libeay.num
index 3236c3ad4dd848edf619690121391285e064074e..fd08ff35fd52da215b920e3622e95e79ce2f9574 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1779,3 +1779,21 @@ BIO_ctrl_get_write_guarantee            1803
 CRYPTO_num_locks                        1804
 CONF_load_bio                           1805
 CONF_load_fp                            1806
 CRYPTO_num_locks                        1804
 CONF_load_bio                           1805
 CONF_load_fp                            1806

+sk_CONF_VALUE_delete                    1807
+sk_CONF_VALUE_pop                       1808
+sk_CONF_VALUE_num                       1809
+sk_CONF_VALUE_pop_free                  1810
+sk_CONF_VALUE_free                      1811
+sk_CONF_VALUE_shift                     1812
+sk_CONF_VALUE_unshift                   1813
+sk_CONF_VALUE_value                     1814
+sk_CONF_VALUE_set                       1815
+sk_CONF_VALUE_zero                      1816
+sk_CONF_VALUE_push                      1817
+sk_CONF_VALUE_delete_ptr                1818
+sk_CONF_VALUE_find                      1819
+sk_CONF_VALUE_set_cmp_func              1820
+sk_CONF_VALUE_new_null                  1821
+sk_CONF_VALUE_dup                       1822
+sk_CONF_VALUE_insert                    1823
+sk_CONF_VALUE_new                       1824