make update

5 files changed, 72 insertions, 23 deletions

diff --git a/TABLE b/TABLE
index 8316f3eb8b..e074185756 100644
--- a/TABLE
+++ b/TABLE
@@ -2691,6 +2691,29 @@ $shared_cflag = -fPIC
 $shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
 $ranlib       = 
 
+*** solaris-x86-cc
+$cc           = cc
+$cflags       = -fast -O -Xa
+$unistd       = 
+$thread_cflag = -D_REENTRANT
+$sys_id       = 
+$lflags       = -lsocket -lnsl -ldl
+$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR
+$bn_obj       = 
+$des_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = dlfcn
+$shared_target= solaris-shared
+$shared_cflag = -KPIC
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib       = 
+
 *** solaris-x86-gcc
 $cc           = gcc
 $cflags       = -O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index f197fd788e..c13a802e68 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -31,8 +31,8 @@ LIB=$(TOP)/libcrypto.a
 LIBSRC=	cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
 	ecb3_enc.c ecb_enc.c  enc_read.c enc_writ.c \
 	fcrypt.c ofb64enc.c ofb_enc.c  pcbc_enc.c \
-	qud_cksm.c rand_key.c read_pwd.c rpc_enc.c  set_key.c  \
-	des_enc.c fcrypt_b.c read2pwd.c \
+	qud_cksm.c rand_key.c rpc_enc.c  set_key.c  \
+	des_enc.c fcrypt_b.c \
 	xcbc_enc.c \
 	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c
 
@@ -194,19 +194,6 @@ qud_cksm.o: ../../include/openssl/opensslconf.h des_locl.h qud_cksm.c
 rand_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
 rand_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h
 rand_key.o: rand_key.c
-read2pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-read2pwd.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-read2pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-read2pwd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-read2pwd.o: ../../include/openssl/ui.h des_locl.h read2pwd.c
-read_pwd.o: ../../e_os.h ../../include/openssl/bio.h
-read_pwd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-read_pwd.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-read_pwd.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
-read_pwd.o: ../../include/openssl/opensslconf.h
-read_pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
-read_pwd.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-read_pwd.o: ../cryptlib.h des_locl.h read_pwd.c
 rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
 rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h
 rpc_enc.o: rpc_enc.c
diff --git a/crypto/evp/Makefile.ssl b/crypto/evp/Makefile.ssl
index cb34098c07..0e7f2e1921 100644
--- a/crypto/evp/Makefile.ssl
+++ b/crypto/evp/Makefile.ssl
@@ -515,8 +515,8 @@ evp_key.o: ../../include/openssl/rd_fst.h ../../include/openssl/rijndael.h
 evp_key.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
 evp_key.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 evp_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-evp_key.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-evp_key.o: ../cryptlib.h evp_key.c
+evp_key.o: ../../include/openssl/ui.h ../../include/openssl/x509.h
+evp_key.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_key.c
 evp_lib.o: ../../e_os.h ../../include/openssl/asn1.h
 evp_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
 evp_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl
index 97a67e6303..edc053539a 100644
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -96,13 +96,15 @@ rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
 rand_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 rand_err.o: ../../include/openssl/symhacks.h rand_err.c
-rand_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-rand_lib.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
+rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h
+rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
+rand_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 rand_lib.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
 rand_lib.o: ../../include/openssl/des.h ../../include/openssl/dh.h
 rand_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-rand_lib.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
-rand_lib.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
+rand_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+rand_lib.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
+rand_lib.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
 rand_lib.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
 rand_lib.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
 rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
@@ -112,7 +114,7 @@ rand_lib.o: ../../include/openssl/rc5.h ../../include/openssl/rd_fst.h
 rand_lib.o: ../../include/openssl/rijndael.h ../../include/openssl/ripemd.h
 rand_lib.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rand_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-rand_lib.o: ../../include/openssl/symhacks.h rand_lib.c
+rand_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lib.c
 rand_unix.o: ../../e_os.h ../../include/openssl/bio.h
 rand_unix.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 rand_unix.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/util/libeay.num b/util/libeay.num
index 04665c1475..0323374c1a 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1728,7 +1728,7 @@ RAND_add                                2201	EXIST::FUNCTION:
 BIO_number_written                      2202	EXIST::FUNCTION:
 BIO_number_read                         2203	EXIST::FUNCTION:
 X509_STORE_CTX_get1_chain               2204	EXIST::FUNCTION:
-ERR_load_RAND_strings                   2205	EXIST::FUNCTION:
+ERR_load_RAND_strings                   2205	NOEXIST::FUNCTION:
 RAND_pseudo_bytes                       2206	EXIST::FUNCTION:
 X509_REQ_get_attr_by_NID                2207	EXIST::FUNCTION:
 X509_REQ_get_attr                       2208	EXIST::FUNCTION:
@@ -2479,3 +2479,40 @@ ENGINE_get_ex_new_index                 2941	EXIST::FUNCTION:
 ENGINE_get_ex_data                      2942	EXIST::FUNCTION:
 ENGINE_set_ex_data                      2943	EXIST::FUNCTION:
 ENGINE_clear_defaults                   2944	EXIST::FUNCTION:
+UI_method_set_closer                    2945	EXIST::FUNCTION:
+UI_dup_input_string                     2946	EXIST::FUNCTION:
+UI_add_error_string                     2947	EXIST::FUNCTION:
+UI_dup_info_string                      2948	EXIST::FUNCTION:
+UI_get_ex_data                          2949	EXIST::FUNCTION:
+UI_get_default_method                   2950	EXIST::FUNCTION:
+UI_get0_result                          2951	EXIST::FUNCTION:
+UI_dup_error_string                     2952	EXIST::FUNCTION:
+UI_get_method                           2953	EXIST::FUNCTION:
+UI_set_ex_data                          2954	EXIST::FUNCTION:
+UI_get0_result_string                   2955	EXIST::FUNCTION:
+UI_free                                 2956	EXIST::FUNCTION:
+UI_new_method                           2957	EXIST::FUNCTION:
+UI_process                              2958	EXIST::FUNCTION:
+UI_get_string_type                      2959	EXIST::FUNCTION:
+UI_get_ex_new_index                     2960	EXIST::FUNCTION:
+UI_set_default_method                   2961	EXIST::FUNCTION:
+UI_method_get_writer                    2962	EXIST::FUNCTION:
+UI_OpenSSL                              2963	EXIST::FUNCTION:
+UI_set_method                           2964	EXIST::FUNCTION:
+UI_method_get_opener                    2965	EXIST::FUNCTION:
+UI_get0_test_string                     2966	EXIST::FUNCTION:
+UI_method_get_reader                    2967	EXIST::FUNCTION:
+UI_set_result                           2968	EXIST::FUNCTION:
+UI_get_result_maxsize                   2969	EXIST::FUNCTION:
+UI_method_get_closer                    2970	EXIST::FUNCTION:
+UI_add_verify_string                    2971	EXIST::FUNCTION:
+UI_method_set_writer                    2972	EXIST::FUNCTION:
+UI_get0_output_string                   2973	EXIST::FUNCTION:
+UI_dup_verify_string                    2974	EXIST::FUNCTION:
+UI_add_input_string                     2975	EXIST::FUNCTION:
+UI_method_set_opener                    2976	EXIST::FUNCTION:
+UI_create_method                        2977	EXIST::FUNCTION:
+UI_add_info_string                      2978	EXIST::FUNCTION:
+UI_get_result_minsize                   2979	EXIST::FUNCTION:
+UI_new                                  2980	EXIST::FUNCTION:
+UI_method_set_reader                    2981	EXIST::FUNCTION: