fix ssl3_pending

diff --git a/CHANGES b/CHANGES
index c4e8638c80130e6862756fb928950e082ed049ef..7ff5bdf306cdf99b88172c2a2acd0a2332438856 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]
 
+  *) Fix ssl3_pending() (ssl/s3_lib.c) to prevent SSL_pending() from
+     returning non-zero before the data has been completely received
+     when using non-blocking I/O.
+     [Bodo Moeller; problem pointed out by John Hughes]
+
   *) Some of the ciphers missed the strength entry (SSL_LOW etc).
      [Ben Laurie, Lutz Jaenicke]
 

diff --git a/LICENSE b/LICENSE
index 3fd259ac323da9a6ae59f4409828d78c34d7acea..7b93e0dbcea5639be66f296404b361d174508bd1 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -12,7 +12,7 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/config b/config
index 7844e5bdda2358dd618fb4bb00639ceff5a8058a..a979231ecd1a6e4da16da42aae335944dd680bbf 100755 (executable)
--- a/config
+++ b/config
@@ -310,6 +310,13 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        exit 0
        ;;
 
+    *"CRAY T3E")
+       echo "t3e-cray-unicosmk"; exit 0;
+       ;;
+
+    *CRAY*)
+       echo "t90-cray-unicos"; exit 0;
+       ;;
 esac
 
 #
@@ -591,6 +598,8 @@ EOF
   mips-sony-newsos4) OUT="newsos4-gcc" ;;
   *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
   *-*-cygwin) OUT="Cygwin" ;;
+  t3e-cray-unicosmk) OUT="cray-t3e" ;;
+  t90-cray-unicos) OUT="cray-t90-cc" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 8537f31eca60cf153fed822c7bdb38bcfb35ebc8..597343232f7fcbddeaaf713fb93429306dc003c6 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -693,6 +693,9 @@ SSL_CIPHER *ssl3_get_cipher(unsigned int u)
 
 int ssl3_pending(SSL *s)
        {
+       if (s->rstate == SSL_ST_READ_BODY)
+               return 0;
+       
        return (s->s3->rrec.type == SSL3_RT_APPLICATION_DATA) ? s->s3->rrec.length : 0;
        }