Changes from the 0.9.6-stable branch and a make update.

diff --git a/TABLE b/TABLE
index d57245cdb01acc92ac824a59a64c19514f2abec8..a8e9b06ed76107352a8fc5a5995cb39cc56853b3 100644 (file)
--- a/TABLE
+++ b/TABLE
@@ -2200,6 +2200,28 @@ $shared_cflag =
 $shared_extension = 
 $ranlib       = 
 
+*** sco3-gcc
+$cc           = gcc
+$cflags       = -O3 -fomit-frame-pointer -Dssize_t=int -DNO_SYS_UN_H
+$unistd       = 
+$thread_cflag = (unknown)
+$lflags       = 
+$bn_ops       = -lsocket
+$bn_obj       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
+$des_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+$shared_extension = 
+$ranlib       = 
+
 *** sco5-cc
 $cc           = cc
 $cflags       = 
@@ -2222,6 +2244,28 @@ $shared_cflag =
 $shared_extension = 
 $ranlib       = 
 
+*** sco5-cc-pentium
+$cc           = cc
+$cflags       = -Kpentium
+$unistd       = 
+$thread_cflag = (unknown)
+$lflags       = -lsocket
+$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
+$bn_obj       = 
+$des_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+$shared_extension = 
+$ranlib       = 
+
 *** sco5-gcc
 $cc           = gcc
 $cflags       = -O3 -fomit-frame-pointer
@@ -2532,10 +2576,10 @@ $ranlib       =
 
 *** unixware-2.0
 $cc           = cc
-$cflags       = -O -DFILIO_H
+$cflags       = -DFILIO_H
 $unistd       = 
-$thread_cflag = (unknown)
-$lflags       = -lsocket -lnsl
+$thread_cflag = -Kthread
+$lflags       = -lsocket -lnsl -lx
 $bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
 $bn_obj       = 
 $des_obj      = 
@@ -2554,10 +2598,76 @@ $ranlib       =
 
 *** unixware-2.0-pentium
 $cc           = cc
-$cflags       = -O -DFILIO_H -Kpentium -Kthread
+$cflags       = -DFILIO_H -Kpentium
+$unistd       = -Kthread
+$thread_cflag = -lsocket -lnsl -lx
+$lflags       = MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL
+$bn_ops       = 
+$bn_obj       = 
+$des_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+$shared_extension = 
+$ranlib       = 
+
+*** unixware-2.1
+$cc           = cc
+$cflags       = -O -DFILIO_H
 $unistd       = 
-$thread_cflag = (unknown)
-$lflags       = -lsocket -lnsl
+$thread_cflag = -Kthread
+$lflags       = -lsocket -lnsl -lx
+$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
+$bn_obj       = 
+$des_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+$shared_extension = 
+$ranlib       = 
+
+*** unixware-2.1-p6
+$cc           = cc
+$cflags       = -O -DFILIO_H -Kp6
+$unistd       = 
+$thread_cflag = -Kthread
+$lflags       = -lsocket -lnsl -lx
+$bn_ops       = MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL
+$bn_obj       = 
+$des_obj      = 
+$bf_obj       = 
+$md5_obj      = 
+$sha1_obj     = 
+$cast_obj     = 
+$rc4_obj      = 
+$rmd160_obj   = 
+$rc5_obj      = 
+$dso_scheme   = 
+$shared_target= 
+$shared_cflag = 
+$shared_extension = 
+$ranlib       = 
+
+*** unixware-2.1-pentium
+$cc           = cc
+$cflags       = -O -DFILIO_H -Kpentium
+$unistd       = 
+$thread_cflag = -Kthread
+$lflags       = -lsocket -lnsl -lx
 $bn_ops       = MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL
 $bn_obj       = 
 $des_obj      = 

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 91b5f1f4f269f45b39c1ee57f47b89f2db839787..bc703ffd2b5f6aff5ed50c5dcd28400e9154a3a6 100644 (file)
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
@@ -723,23 +723,24 @@ s_client.o: ../include/openssl/comp.h ../include/openssl/conf.h
 s_client.o: ../include/openssl/crypto.h ../include/openssl/des.h
 s_client.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 s_client.o: ../include/openssl/e_os.h ../include/openssl/e_os.h
-s_client.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-s_client.o: ../include/openssl/evp.h ../include/openssl/idea.h
-s_client.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-s_client.o: ../include/openssl/md4.h ../include/openssl/md5.h
-s_client.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
-s_client.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s_client.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s_client.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_client.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-s_client.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-s_client.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-s_client.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_client.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_client.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_client.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s_client.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s_client.o: ../include/openssl/x509_vfy.h apps.h s_apps.h
+s_client.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+s_client.o: ../include/openssl/err.h ../include/openssl/evp.h
+s_client.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+s_client.o: ../include/openssl/md2.h ../include/openssl/md4.h
+s_client.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+s_client.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+s_client.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s_client.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s_client.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+s_client.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_client.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s_client.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s_client.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+s_client.o: s_apps.h
 s_server.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 s_server.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 s_server.o: ../include/openssl/buffer.h ../include/openssl/cast.h
@@ -747,23 +748,24 @@ s_server.o: ../include/openssl/comp.h ../include/openssl/conf.h
 s_server.o: ../include/openssl/crypto.h ../include/openssl/des.h
 s_server.o: ../include/openssl/dh.h ../include/openssl/dsa.h
 s_server.o: ../include/openssl/e_os.h ../include/openssl/e_os.h
-s_server.o: ../include/openssl/e_os2.h ../include/openssl/err.h
-s_server.o: ../include/openssl/evp.h ../include/openssl/idea.h
-s_server.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-s_server.o: ../include/openssl/md4.h ../include/openssl/md5.h
-s_server.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
-s_server.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-s_server.o: ../include/openssl/opensslv.h ../include/openssl/pem.h
-s_server.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s_server.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-s_server.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-s_server.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s_server.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s_server.o: ../include/openssl/x509_vfy.h apps.h s_apps.h
+s_server.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+s_server.o: ../include/openssl/err.h ../include/openssl/evp.h
+s_server.o: ../include/openssl/idea.h ../include/openssl/lhash.h
+s_server.o: ../include/openssl/md2.h ../include/openssl/md4.h
+s_server.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
+s_server.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+s_server.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+s_server.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+s_server.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
+s_server.o: ../include/openssl/rc5.h ../include/openssl/ripemd.h
+s_server.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s_server.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_server.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_server.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_server.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s_server.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h apps.h
+s_server.o: s_apps.h
 s_socket.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 s_socket.o: ../include/openssl/blowfish.h ../include/openssl/bn.h
 s_socket.o: ../include/openssl/buffer.h ../include/openssl/cast.h

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 3ce294e4e0cf335936358b1de1a2e91230886a74..7548ac324c05e105aeeefe99772d0fb3c3d0a63b 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -211,7 +211,7 @@ const char *RAND_file_name(char *buf, size_t size)
                {
                if (OPENSSL_issetugid() == 0)
                        s=getenv("HOME");
-               if (s != NULL && ((int)(strlen(s)+strlen(RFILE)+2) < size))
+               if (s != NULL && (strlen(s)+strlen(RFILE)+2 < size))
                        {
                        strcpy(buf,s);
 #ifndef VMS

diff --git a/util/libeay.num b/util/libeay.num
index 0f421813b72d944c212a177709a0650e3a5ba9fd..5e5b96c8980f953f8cdf8a468dfb82ad1b9913aa 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -197,7 +197,7 @@ DH_generate_parameters                  204 EXIST::FUNCTION:DH
 DH_new                                  205    EXIST::FUNCTION:DH
 DH_size                                 206    EXIST::FUNCTION:DH
 DHparams_print                          207    EXIST::FUNCTION:DH
-DHparams_print_fp                       208    EXIST::FUNCTION:FP_API,DH
+DHparams_print_fp                       208    EXIST::FUNCTION:DH,FP_API
 DSA_free                                209    EXIST::FUNCTION:DSA
 DSA_generate_key                        210    EXIST::FUNCTION:DSA
 DSA_generate_parameters                 211    EXIST::FUNCTION:DSA
@@ -301,8 +301,8 @@ EVP_des_ede_cfb                         308 EXIST::FUNCTION:DES
 EVP_des_ede_ofb                         309    EXIST::FUNCTION:DES
 EVP_des_ofb                             310    EXIST::FUNCTION:DES
 EVP_desx_cbc                            311    EXIST::FUNCTION:DES
-EVP_dss                                 312    EXIST::FUNCTION:SHA,DSA
-EVP_dss1                                313    EXIST::FUNCTION:SHA,DSA
+EVP_dss                                 312    EXIST::FUNCTION:DSA,SHA
+EVP_dss1                                313    EXIST::FUNCTION:DSA,SHA
 EVP_enc_null                            314    EXIST::FUNCTION:
 EVP_get_cipherbyname                    315    EXIST::FUNCTION:
 EVP_get_digestbyname                    316    EXIST::FUNCTION:
@@ -478,7 +478,7 @@ RSA_generate_key                        485 EXIST::FUNCTION:RSA
 RSA_new                                 486    EXIST::FUNCTION:RSA
 RSA_new_method                          487    EXIST::FUNCTION:RSA
 RSA_print                               488    EXIST::FUNCTION:RSA
-RSA_print_fp                            489    EXIST::FUNCTION:FP_API,RSA
+RSA_print_fp                            489    EXIST::FUNCTION:RSA,FP_API
 RSA_private_decrypt                     490    EXIST::FUNCTION:RSA
 RSA_private_encrypt                     491    EXIST::FUNCTION:RSA
 RSA_public_decrypt                      492    EXIST::FUNCTION:RSA
@@ -742,7 +742,7 @@ d2i_PrivateKey                          748 EXIST::FUNCTION:
 d2i_PublicKey                           749    EXIST::FUNCTION:
 d2i_RSAPrivateKey                       750    EXIST::FUNCTION:RSA
 d2i_RSAPrivateKey_bio                   751    EXIST::FUNCTION:RSA
-d2i_RSAPrivateKey_fp                    752    EXIST::FUNCTION:FP_API,RSA
+d2i_RSAPrivateKey_fp                    752    EXIST::FUNCTION:RSA,FP_API
 d2i_RSAPublicKey                        753    EXIST::FUNCTION:RSA
 d2i_X509                                754    EXIST::FUNCTION:
 d2i_X509_ALGOR                          755    EXIST::FUNCTION:
@@ -844,7 +844,7 @@ i2d_PrivateKey                          851 EXIST::FUNCTION:
 i2d_PublicKey                           852    EXIST::FUNCTION:
 i2d_RSAPrivateKey                       853    EXIST::FUNCTION:RSA
 i2d_RSAPrivateKey_bio                   854    EXIST::FUNCTION:RSA
-i2d_RSAPrivateKey_fp                    855    EXIST::FUNCTION:FP_API,RSA
+i2d_RSAPrivateKey_fp                    855    EXIST::FUNCTION:RSA,FP_API
 i2d_RSAPublicKey                        856    EXIST::FUNCTION:RSA
 i2d_X509                                857    EXIST::FUNCTION:
 i2d_X509_ALGOR                          858    EXIST::FUNCTION:
@@ -933,8 +933,8 @@ d2i_RSAPublicKey_bio                    945 EXIST::FUNCTION:RSA
 i2d_RSAPublicKey_bio                    946    EXIST::FUNCTION:RSA
 PEM_read_RSAPublicKey                   947    EXIST:!WIN16:FUNCTION:RSA
 PEM_write_RSAPublicKey                  949    EXIST:!WIN16:FUNCTION:RSA
-d2i_RSAPublicKey_fp                     952    EXIST::FUNCTION:FP_API,RSA
-i2d_RSAPublicKey_fp                     954    EXIST::FUNCTION:FP_API,RSA
+d2i_RSAPublicKey_fp                     952    EXIST::FUNCTION:RSA,FP_API
+i2d_RSAPublicKey_fp                     954    EXIST::FUNCTION:RSA,FP_API
 BIO_copy_next_retry                     955    EXIST::FUNCTION:
 RSA_flags                               956    EXIST::FUNCTION:RSA
 X509_STORE_add_crl                      957    EXIST::FUNCTION:
@@ -1212,7 +1212,7 @@ name_cmp                                1239      EXIST::FUNCTION:
 str_dup                                 1240   NOEXIST::FUNCTION:
 i2s_ASN1_ENUMERATED                     1241   EXIST::FUNCTION:
 i2s_ASN1_ENUMERATED_TABLE               1242   EXIST::FUNCTION:
-BIO_s_log                               1243   EXIST:!WIN16,!WIN32,!macintosh:FUNCTION:
+BIO_s_log                               1243   EXIST:!WIN32,!WIN16,!macintosh:FUNCTION:
 BIO_f_reliable                          1244   EXIST::FUNCTION:
 PKCS7_dataFinal                         1245   EXIST::FUNCTION:
 PKCS7_dataDecode                        1246   EXIST::FUNCTION:
@@ -1535,7 +1535,7 @@ ASN1_STRING_set_default_mask_asc        1960      EXIST:!VMS:FUNCTION:
 ASN1_STRING_set_def_mask_asc            1960   EXIST:VMS:FUNCTION:
 PEM_write_bio_RSA_PUBKEY                1961   EXIST::FUNCTION:RSA
 ASN1_INTEGER_cmp                        1963   EXIST::FUNCTION:
-d2i_RSA_PUBKEY_fp                       1964   EXIST::FUNCTION:FP_API,RSA
+d2i_RSA_PUBKEY_fp                       1964   EXIST::FUNCTION:RSA,FP_API
 X509_trust_set_bit_asc                  1967   NOEXIST::FUNCTION:
 PEM_write_bio_DSA_PUBKEY                1968   EXIST::FUNCTION:
 X509_STORE_CTX_free                     1969   EXIST::FUNCTION:
@@ -1638,7 +1638,7 @@ ASN1_BIT_STRING_set                     2109      EXIST::FUNCTION:
 X509_TRUST_get_count                    2110   EXIST::FUNCTION:
 ASN1_INTEGER_free                       2111   EXIST::FUNCTION:
 OTHERNAME_free                          2112   EXIST::FUNCTION:
-i2d_RSA_PUBKEY_fp                       2113   EXIST::FUNCTION:FP_API,RSA
+i2d_RSA_PUBKEY_fp                       2113   EXIST::FUNCTION:RSA,FP_API
 ASN1_INTEGER_dup                        2114   EXIST::FUNCTION:
 d2i_X509_CERT_AUX                       2115   EXIST::FUNCTION:
 PEM_write_bio_PUBKEY                    2117   EXIST::FUNCTION: