Merge from main trunk.

diff --git a/STATUS b/STATUS
index 64e7b43fe56d101b2671157756306505b102d27f..8f090375724d9fcbe51a610c9db6c89bd5059059 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,6 +1,6 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2000/09/20 16:40:09 $
+  ______________                           $Date: 2000/09/21 20:29:00 $
 
   DEVELOPMENT STATE
 
@@ -84,6 +84,46 @@
                        alpha-gcc (V4.0E, gcc 2.8.1)            - success
                        ultrix-cc (V4.5)                        - success
                        ultrix-gcc (V4.5, gcc 2.8.1)            - success
+                       0.9.6-beta3 is available:
+                       aix-cc (4.3)                            - success
+                       aix-cc [engine] (4.3)                   - success
+                       linux-elf (RedHat 5.2, gcc 2.7.2.3)     - success
+                       linux-elf (RedHat 6.2)                  - success
+                       linux-elf [engine] (RedHat 6.2)         - success
+                       solaris-sparcv9-gcc (5.7, gcc 2.95.2)   - success
+                       solaris-sparcv9-gcc (5.6, gcc 2.95.2)   - success
+                       solaris-sparcv9-cc (5.6, SunWS C 4.2)   - success
+                       solaris-sparcv9-cc [engine] (5.6, SunWS C 4.2)- success
+                       VC-WIN32 (NT4 SP6, VC6 SP2)             - success
+                       VC-WIN32 (NT4 SP6, Cygwin)              - success
+                               The files used for testing must have CR/LF
+                                       as line endings.
+                       VC-WIN32 (NT4 SP6, Mingw32)             - failed
+                               mingw32a.mak contains a few lines that
+                                       generate an error.
+                       VC-NT static libs (NT4 SP6, VC6 SP4)    - failed
+                               Complains about unresolved external symbol
+                                       __imp__RegQueryValueEx.  This only
+                                       happens when building the static
+                                       libraries.  Tests pass as soon as
+                                       you make sure advapi32.lib gets
+                                       linked in. [FIXED]
+                       VC-WIN32 (W2K Pro SP1, VC6 SP3, PSDK Jul2000)- success
+                       hpux-parisc-gcc (B.10.20, gcc 2.95.2)   - success
+                       hpux-parisc-cc (B.10.20, cc A.10.32.30) - success
+                       hpux-parisc-gcc [engine] (B.10.20, gcc 2.95.2)- success
+                       hpux-parisc-cc [engine] (B.10.20, cc A.10.32.30)- success
+                       FreeBSD (2.2.5)                         - failed
+                               Only having USE_TOD made speed.c issue an
+                                       error. [FIXED]
+                       FreeBSD-alpha (4.1, gcc 2.95.2)         - success
+                               The USE_TOD fix needed to be applied.
+                               There were warnings about -O3 triggering
+                                       known optimizer bugs on that
+                                       platform.
+                       OpenBSD-x86 (2.7, gcc 2.95.2)           - success
+                       alpha-cc (OSF1 V4.0)                    - success
+                       solaris-x86-gcc (5.8, gcc 2.95.2)       - success
     o  OpenSSL 0.9.5a: Released on April     1st, 2000
     o  OpenSSL 0.9.5:  Released on February 28th, 2000
     o  OpenSSL 0.9.4:  Released on August   09th, 1999

diff --git a/apps/speed.c b/apps/speed.c
index 0f93525209e1072275ec0d28b3d8d30b087e357f..ba41916371406f05f231ea133b053a80a9d691c2 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -116,7 +116,7 @@
 #include <sys/timeb.h>
 #endif
 
-#if !defined(TIMES) && !defined(TIMEB)
+#if !defined(TIMES) && !defined(TIMEB) && !defined(USE_TOD)
 #error "It seems neither struct tms nor struct timeb is supported in this platform!"
 #endif
 

diff --git a/doc/ssl/SSL_library_init.pod b/doc/ssl/SSL_library_init.pod
index bf2a94c760de22f82a79f4d0ed996eafae72fbf7..ecf3c4858e528849a4d677a56054c94112d22331 100644 (file)
--- a/doc/ssl/SSL_library_init.pod
+++ b/doc/ssl/SSL_library_init.pod
@@ -24,7 +24,7 @@ for SSL_library_init().
 
 SSL_library_init() must be called before any other action takes place.
 
-=head1 IMPORTANT
+=head1 WARNING
 
 SSL_library_init() only registers ciphers. Another important initialization
 is the seeding of the PRNG (Pseudo Random Number Generator), which has to

diff --git a/doc/ssl/SSL_read.pod b/doc/ssl/SSL_read.pod
index 708b20fdb5e3fd4831e6bcf59d6f27e2a1e72b6c..072dc26cf2843470dd33f93170bbc696a3f29dac 100644 (file)
--- a/doc/ssl/SSL_read.pod
+++ b/doc/ssl/SSL_read.pod
@@ -38,7 +38,7 @@ non-blocking socket, nothing is to be done, but select() can be used to check
 for the required condition. When using a buffering BIO, like a BIO pair, data
 must be written into or retrieved out of the BIO before being able to continue.
 
-=head1 IMPORTANT
+=head1 WARNING
 
 When an SSL_read() operation has to be repeated because of
 B<SSL_ERROR_WANT_READ> or B<SSL_ERROR_WANT_WRITE>, it must be repeated

diff --git a/doc/ssl/SSL_write.pod b/doc/ssl/SSL_write.pod
index 0a1adaba7327b2259d8b550911ee6be0e258cd92..db67c187e0ee9387574e9ee73a7faf851a6a3217 100644 (file)
--- a/doc/ssl/SSL_write.pod
+++ b/doc/ssl/SSL_write.pod
@@ -38,7 +38,7 @@ non-blocking socket, nothing is to be done, but select() can be used to check
 for the required condition. When using a buffering BIO, like a BIO pair, data
 must be written into or retrieved out of the BIO before being able to continue.
 
-=head1 IMPORTANT
+=head1 WARNING
 
 When an SSL_write() operation has to be repeated because of
 B<SSL_ERROR_WANT_READ> or B<SSL_ERROR_WANT_WRITE>, it must be repeated

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 046f0e253c3971a373fda65357a74cd7c4e3388a..6978104234a95f4c159e6bd59360bda504ccae40 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -112,7 +112,8 @@ sub do_lib_rule
        if (!$shlib)
                {
 #              $ret.="\t\$(RM) \$(O_$Name)\n";
-               $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs\n<<\n";
+               $ex =' advapi32.lib';
+               $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs $ex\n<<\n";
                }
        else
                {