Don't define platform-dependent preprocessor symbols for OPENSSL_THREAD_DEFINES.

"make update".

diff --git a/Configure b/Configure
index cfa06fab59b7cdb1d955a44f5eb21a7af2171231..5a46712da81620b892b4e6ac88acb95ff352184e 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -554,14 +554,14 @@ else
        {
        $thread_cflags="-DTHREADS $thread_cflag $cflags";
        $thread_defines .= "#define THREADS\n";
-       my $def;
-       foreach $def (split ' ',$thread_cflag)
-               {
-               if ($def =~ s/^-D// && $def !~ /^_/)
-                       {
-                       $thread_defines .= "#define $def\n";
-                       }
-               }
+#      my $def;
+#      foreach $def (split ' ',$thread_cflag)
+#              {
+#              if ($def =~ s/^-D// && $def !~ /^_/)
+#                      {
+#                      $thread_defines .= "#define $def\n";
+#                      }
+#              }
        }       
 
 $lflags="$libs$lflags"if ($libs ne "");

diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl
index 68ef887902fa438822c5fc8b1be8029f3f607218..a3d7115b9b551793ea02a8cfa1a8ffad40397095 100644 (file)
--- a/crypto/rand/Makefile.ssl
+++ b/crypto/rand/Makefile.ssl
@@ -83,6 +83,7 @@ md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 md_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rand_egd.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h
 rand_err.o: ../../include/openssl/err.h ../../include/openssl/rand.h
 rand_lib.o: ../../include/openssl/rand.h
 randfile.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h

diff --git a/doc/crypto/RAND_load_file.pod b/doc/crypto/RAND_load_file.pod
index 3e7585516096fba4332f000d090b82c6d837e3a5..8dd700ca3d4b9076dbd963cad16c8aadba945fa1 100644 (file)
--- a/doc/crypto/RAND_load_file.pod
+++ b/doc/crypto/RAND_load_file.pod
@@ -24,8 +24,8 @@ too small for the path name, an error occurs.
 
 RAND_load_file() reads a number of bytes from file B<filename> and
 adds them to the PRNG. If B<max_bytes> is non-negative,
-up to to B<max_bytes> are read; if B<max_bytes> is -1, the complete file
-is read.
+up to to B<max_bytes> are read; starting with OpenSSL 0.9.5,
+if B<max_bytes> is -1, the complete file is read.
 
 RAND_write_file() writes a number of random bytes (currently 1024) to
 file B<filename> which can be used to initialize the PRNG by calling

diff --git a/util/libeay.num b/util/libeay.num
index fc710971414a39f13aa905403753c0dd1e99bcba..e70cec11dd573c3ed1df09ba982a1098372e3094 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2224,3 +2224,5 @@ des_crypt                               2249
 PEM_write_bio_X509_REQ_NEW              2250
 PEM_write_X509_REQ_NEW                  2251
 BIO_callback_ctrl                       2252
+RAND_egd                                2253
+RAND_status                             2254

diff --git a/util/ssleay.num b/util/ssleay.num
index f35094a761a50dd52ddb8d43ce4c6a714a76e26d..ddfe1f1aa5f36454cfa6fae43138fd6253d19827 100755 (executable)
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -222,3 +222,5 @@ SSL_set_trust                           239
 SSL_get_finished                        240
 SSL_get_peer_finished                   241
 SSL_get1_session                        242
+SSL_CTX_callback_ctrl                   243
+SSL_callback_ctrl                       244